Skip to content

Commit 47bd5b9

Browse files
committed
Rename React.Sample.Mvc6 to React.Sample.CoreMvc
1 parent babdc3d commit 47bd5b9

File tree

15 files changed

+30
-32
lines changed

15 files changed

+30
-32
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ src/React.Sample.Webpack/build
1010
*.generated.js
1111
*.generated.js.map
1212
*.generated.min.js
13-
src/React.Sample.Mvc6/wwwroot/js/Sample.js
13+
src/React.Sample.CoreMvc/wwwroot/js/Sample.js
1414
*.lock.json
1515
.vs/
1616

src/React.Sample.ConsoleApp/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2015, Facebook, Inc.
33
* All rights reserved.
44
*
@@ -35,7 +35,7 @@ private static void Initialize()
3535
Initializer.Initialize(registration => registration.AsSingleton());
3636
var container = React.AssemblyRegistration.Container;
3737
// Register some components that are normally provided by the integration library
38-
// (eg. React.AspNet or React.Web.Mvc6)
38+
// (eg. React.AspNet or React.Web.Mvc4)
3939
container.Register<ICache, NullCache>();
4040
container.Register<IFileSystem, SimpleFileSystem>();
4141
}

src/React.Sample.Mvc6/Controllers/HomeController.cs src/React.Sample.CoreMvc/Controllers/HomeController.cs

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2015, Facebook, Inc.
33
* All rights reserved.
44
*
@@ -13,12 +13,10 @@
1313
using System.Collections.Generic;
1414
using System.Linq;
1515
using Microsoft.AspNetCore.Mvc;
16-
using Newtonsoft.Json;
17-
using Newtonsoft.Json.Serialization;
18-
using React.Sample.Mvc6.Models;
19-
using React.Sample.Mvc6.ViewModels;
16+
using React.Sample.CoreMvc.Models;
17+
using React.Sample.CoreMvc.ViewModels;
2018

21-
namespace React.Sample.Mvc6.Models
19+
namespace React.Sample.CoreMvc.Models
2220
{
2321
public class AuthorModel
2422
{
@@ -33,7 +31,7 @@ public class CommentModel
3331
}
3432
}
3533

36-
namespace React.Sample.Mvc6.ViewModels
34+
namespace React.Sample.CoreMvc.ViewModels
3735
{
3836
public class IndexViewModel
3937
{
@@ -42,7 +40,7 @@ public class IndexViewModel
4240
}
4341
}
4442

45-
namespace React.Sample.Mvc6.Controllers
43+
namespace React.Sample.CoreMvc.Controllers
4644
{
4745
public class HomeController : Controller
4846
{

src/React.Sample.Mvc6/Program.cs src/React.Sample.CoreMvc/Program.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
using Microsoft.AspNetCore;
1111
using Microsoft.AspNetCore.Hosting;
1212

13-
14-
namespace React.Sample.Mvc6
13+
namespace React.Sample.CoreMvc
1514
{
1615
public class Program
1716
{

src/React.Sample.Mvc6/Properties/launchSettings.json src/React.Sample.CoreMvc/Properties/launchSettings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"ASPNETCORE_ENVIRONMENT": "Development"
1616
}
1717
},
18-
"React.Sample.Mvc6": {
18+
"React.Sample.CoreMvc": {
1919
"commandName": "Project",
2020
"launchBrowser": true,
2121
"launchUrl": "http://localhost:5000",
@@ -24,4 +24,4 @@
2424
}
2525
}
2626
}
27-
}
27+
}

src/React.Sample.Mvc6/React.Sample.Mvc6.csproj src/React.Sample.CoreMvc/React.Sample.CoreMvc.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>React.Sample.Mvc6</AssemblyName>
6+
<AssemblyName>React.Sample.CoreMvc</AssemblyName>
77
<OutputType>Exe</OutputType>
8-
<PackageId>React.Sample.Mvc6</PackageId>
8+
<PackageId>React.Sample.CoreMvc</PackageId>
99
<NoWarn>1701</NoWarn>
1010
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0</RuntimeFrameworkVersion>
1111
</PropertyGroup>

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77
* of patent rights can be found in the PATENTS file in the same directory.
88
*/
99

10+
using System;
1011
using Microsoft.AspNetCore.Builder;
1112
using Microsoft.AspNetCore.Hosting;
1213
using Microsoft.AspNetCore.Http;
1314
using Microsoft.Extensions.Configuration;
1415
using Microsoft.Extensions.DependencyInjection;
1516
using Microsoft.Extensions.Logging;
16-
using Newtonsoft.Json;
17-
using Newtonsoft.Json.Serialization;
1817
using React.AspNet;
19-
using System;
2018

21-
namespace React.Sample.Mvc6
19+
namespace React.Sample.CoreMvc
2220
{
2321
public class Startup
2422
{

src/React.Sample.Mvc6/Views/Home/Index.cshtml src/React.Sample.CoreMvc/Views/Home/Index.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@using React.AspNet
2-
@model React.Sample.Mvc6.ViewModels.IndexViewModel
1+
@using React.AspNet
2+
@model React.Sample.CoreMvc.ViewModels.IndexViewModel
33
<!DOCTYPE html>
44
<html>
55
<head>
File renamed without changes.
File renamed without changes.

src/React.sln

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.4
4+
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F567B25C-E869-4C93-9C96-077761250F87}"
77
EndProject
@@ -62,11 +62,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Tests", "..\tests\Rea
6262
EndProject
6363
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet", "React.AspNet\React.AspNet.csproj", "{631FCC55-0219-46DC-838A-C5A3E878943A}"
6464
EndProject
65-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.csproj", "{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}"
66-
EndProject
6765
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Router", "React.Router\React.Router.csproj", "{D076273B-C5EA-47C7-923D-523E4C5EE30D}"
6866
EndProject
69-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.AspNet.Middleware", "React.AspNet.Middleware\React.AspNet.Middleware.csproj", "{7E1C3999-1982-476D-9307-12B30737B41E}"
67+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet.Middleware", "React.AspNet.Middleware\React.AspNet.Middleware.csproj", "{7E1C3999-1982-476D-9307-12B30737B41E}"
68+
EndProject
69+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.CoreMvc", "React.Sample.CoreMvc\React.Sample.CoreMvc.csproj", "{305918EF-AD05-4743-9B3A-DB1CE84D467E}"
7070
EndProject
7171
Global
7272
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -130,10 +130,6 @@ Global
130130
{631FCC55-0219-46DC-838A-C5A3E878943A}.Debug|Any CPU.Build.0 = Debug|Any CPU
131131
{631FCC55-0219-46DC-838A-C5A3E878943A}.Release|Any CPU.ActiveCfg = Release|Any CPU
132132
{631FCC55-0219-46DC-838A-C5A3E878943A}.Release|Any CPU.Build.0 = Release|Any CPU
133-
{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
134-
{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
135-
{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
136-
{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Release|Any CPU.Build.0 = Release|Any CPU
137133
{D076273B-C5EA-47C7-923D-523E4C5EE30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138134
{D076273B-C5EA-47C7-923D-523E4C5EE30D}.Debug|Any CPU.Build.0 = Debug|Any CPU
139135
{D076273B-C5EA-47C7-923D-523E4C5EE30D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,6 +138,10 @@ Global
142138
{7E1C3999-1982-476D-9307-12B30737B41E}.Debug|Any CPU.Build.0 = Debug|Any CPU
143139
{7E1C3999-1982-476D-9307-12B30737B41E}.Release|Any CPU.ActiveCfg = Release|Any CPU
144140
{7E1C3999-1982-476D-9307-12B30737B41E}.Release|Any CPU.Build.0 = Release|Any CPU
141+
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142+
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Debug|Any CPU.Build.0 = Debug|Any CPU
143+
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Release|Any CPU.ActiveCfg = Release|Any CPU
144+
{305918EF-AD05-4743-9B3A-DB1CE84D467E}.Release|Any CPU.Build.0 = Release|Any CPU
145145
EndGlobalSection
146146
GlobalSection(SolutionProperties) = preSolution
147147
HideSolutionNode = FALSE
@@ -161,8 +161,11 @@ Global
161161
{350EFB8E-693C-4DFE-8162-C99C359CFC71} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
162162
{6AA0D75E-5797-4690-BEFC-098A60C511A3} = {F567B25C-E869-4C93-9C96-077761250F87}
163163
{631FCC55-0219-46DC-838A-C5A3E878943A} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
164-
{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
165164
{D076273B-C5EA-47C7-923D-523E4C5EE30D} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
166165
{7E1C3999-1982-476D-9307-12B30737B41E} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
166+
{305918EF-AD05-4743-9B3A-DB1CE84D467E} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
167+
EndGlobalSection
168+
GlobalSection(ExtensibilityGlobals) = postSolution
169+
SolutionGuid = {DCF4A41E-C60D-4086-98A9-6F8508D7E8D0}
167170
EndGlobalSection
168171
EndGlobal

0 commit comments

Comments
 (0)