Skip to content

Commit aa6c666

Browse files
author
Jimmy Sorting
committed
Upgrade to aspnet 5 beta 6 version
1 parent 5675836 commit aa6c666

File tree

4 files changed

+38
-37
lines changed

4 files changed

+38
-37
lines changed

‎src/React.AspNet/project.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
}
1616
},
1717
"dependencies": {
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",
18+
"Microsoft.Framework.DependencyInjection": "1.0.0-beta6",
19+
"Microsoft.AspNet.Mvc.Core": "6.0.0-beta6",
20+
"Microsoft.AspNet.StaticFiles": "1.0.0-beta6",
21+
"Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta6",
22+
"Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-beta6",
2223
"React.Core": "",
2324
"JavaScriptEngineSwitcher.Core": "1.2.4.0"
2425
},

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6-
</PropertyGroup>
7-
<PropertyGroup Label="Globals">
8-
<ProjectGuid>022dc77e-5e48-4cf4-ad8b-dc4b9b52e02e</ProjectGuid>
9-
<RootNamespace>React.Sample.Mvc6</RootNamespace>
10-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
11-
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
12-
</PropertyGroup>
13-
<PropertyGroup>
14-
<SchemaVersion>2.0</SchemaVersion>
15-
<DevelopmentServerPort>3044</DevelopmentServerPort>
16-
</PropertyGroup>
17-
<ProjectExtensions>
18-
<VisualStudio>
19-
<UserProperties bower_1json__JSONSchema="http://json.schemastore.org/bower" package_1json__JSONSchema="http://json.schemastore.org/package" />
20-
</VisualStudio>
21-
</ProjectExtensions>
22-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
23-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<PropertyGroup Label="Globals">
8+
<ProjectGuid>022dc77e-5e48-4cf4-ad8b-dc4b9b52e02e</ProjectGuid>
9+
<RootNamespace>React.Sample.Mvc6</RootNamespace>
10+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
11+
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<SchemaVersion>2.0</SchemaVersion>
15+
<DevelopmentServerPort>3044</DevelopmentServerPort>
16+
</PropertyGroup>
17+
<ProjectExtensions>
18+
<VisualStudio>
19+
<UserProperties />
20+
</VisualStudio>
21+
</ProjectExtensions>
22+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
23+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" />
2424
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
5353
if (string.Equals(env.EnvironmentName, "Development", StringComparison.OrdinalIgnoreCase))
5454
{
5555
//app.UseBrowserLink();
56-
app.UseErrorPage(ErrorPageOptions.ShowAll);
56+
app.UseErrorPage();
5757
}
5858
else
5959
{

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"webroot": "wwwroot",
33
"version": "1.5.3-*",
44
"dependencies": {
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",
5+
"Microsoft.AspNet.Mvc": "6.0.0-beta6",
6+
"Microsoft.AspNet.Diagnostics": "1.0.0-beta6",
7+
"Microsoft.AspNet.Server.IIS": "1.0.0-beta6",
8+
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta6",
9+
"Microsoft.AspNet.StaticFiles": "1.0.0-beta6",
10+
"Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-beta6",
11+
"Microsoft.Framework.Configuration.Json": "1.0.0-beta6",
12+
"Microsoft.Framework.Logging": "1.0.0-beta6",
13+
"Microsoft.Framework.Logging.Console": "1.0.0-beta6",
1414
"React.AspNet": "",
1515
"React.Core": "",
1616
"JavaScriptEngineSwitcher.V8": "1.2.4.0",

0 commit comments

Comments
 (0)