Making React.AspNet compatible with ASP.NET Core RC2 #271
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| */ | ||
|
|
||
| using System.IO; | ||
| using Microsoft.AspNetCore.Hosting; | ||
|
|
||
| namespace React.AspNet | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ | |
| using System; | ||
| using System.Collections.Concurrent; | ||
| using System.Linq; | ||
| using Microsoft.AspNetCore.Http; | ||
| using React.Exceptions; | ||
| using React.TinyIoC; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
|
|
@@ -43,28 +43,14 @@ public HttpContextLifetimeProvider(IServiceProvider appServiceProvider) | |
| /// </summary> | ||
| private readonly string _keyName = PREFIX + Guid.NewGuid(); | ||
|
|
||
| /// <summary> | ||
| /// Gets the current per-request registrations for the current request. | ||
| /// </summary> | ||
| private PerRequestRegistrations Registrations | ||
| { | ||
| get | ||
| { | ||
| var registrations = _appServiceProvider.GetService<PerRequestRegistrations>(); | ||
|
There was a problem hiding this comment. This change was incorrect, it wasn't handling per-request singletons properly and was instead just using a single instance for the entire app. I fixed it in a4992da 👍 |
||
| if (registrations == null) | ||
| { | ||
| throw new ReactNotInitialisedException( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| [assembly: AssemblyTitle("React.AspNet")] | ||
| [assembly: AssemblyDescription("ReactJS and Babel tools for ASP.NET Core, including ASP.NET Core MVC")] | ||
| [assembly: ComVisible(false)] | ||
| [assembly: Guid("f0e355fc-a89f-4fd6-b171-1ef03c838a67")] | ||
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,52 @@ | ||
| { | ||
| "version": "2.3.0-*", | ||
| "authors": [ "Daniel Lo Nigro" ], | ||
| "packOptions": { | ||
| "owners": [ "Daniel Lo Nigro" ], | ||
| "licenseUrl": "https://github.com/reactjs/React.NET#licence", | ||
| "iconUrl": "http://facebook.github.io/react/img/logo_og.png", | ||
| "copyright": "Copyright 2014-Present Facebook, Inc", | ||
| "title": "ReactJS.NET (MVC Core)", | ||
| "description": "ReactJS and Babel tools for ASP.NET Core, including ASP.NET MVC Core. 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" ], | ||
| "projectUrl": "http://reactjs.net/" | ||
| }, | ||
| "configurations": { | ||
| "Debug": { | ||
| "buildOptions": { | ||
| "define": [ "DEBUG", "TRACE", "ASPNET5" ] | ||
|
||
| } | ||
| }, | ||
| "Release": { | ||
| "buildOptions": { | ||
| "define": [ "RELEASE", "TRACE", "ASPNET5" ], | ||
| "optimize": true, | ||
| "warningsAsErrors": true | ||
| } | ||
| } | ||
| }, | ||
| "dependencies": { | ||
| "JsPool": "0.4.1", | ||
| "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final", | ||
| "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final", | ||
| "Microsoft.Extensions.FileProviders.Physical": "1.0.0-rc2-final", | ||
| "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.0-rc2-final", | ||
| "Microsoft.Extensions.DependencyInjection": "1.0.0-rc2-final", | ||
| "JavaScriptEngineSwitcher.Core": "1.5.0", | ||
| "JavaScriptEngineSwitcher.Msie": "1.5.0", | ||
| "JavaScriptEngineSwitcher.V8": "1.5.2", | ||
| "MsieJavaScriptEngine": "1.7.0", | ||
| "React.Core": "2.3.0-*" | ||
| }, | ||
| "frameworks": { | ||
| "net451": { | ||
| "bin": { | ||
| "assembly": "../../bin/React.AspNet/bin/{configuration}/net451/React.AspNet.dll", | ||
| "pdb": "../../bin/React.AspNet/bin/{configuration}/net451/React.AspNet.pdb" | ||
| } | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "postcompile": [ "dotnet pack --output ../../bin/React.AspNet/ --no-build --version-suffix %project:Version% project.json" ] | ||
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this run the equivalent
dotnetcommand to ensure RC2 is installed on the build machine?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I know it no longer works that way in RC2. There is no equivalent to dnvm in the new toolset. If you have .NET Core RC2 installed already, you can just get the ASP.NET Core packages using NuGet.
That was one of the biggest changes from RC1 to RC2, and it was done in order to make all .NET Core environments consistent with each other.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the info 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like they've got an install script for CI servers (see https://dotnet.github.io/docs/core-concepts/dnx-migration.html). However, their docs for AppVeyor just say "TODO" (https://dotnet.github.io/docs/core-concepts/core-sdk/cli/using-ci-with-cli.html). It's fine to ignore that for now if the AppVeyor build actually works with no changes.