dotnet · ryanbrandenburg · Nov 28, 2018 · Oct 18, 2018 · Oct 18, 2018 · Oct 18, 2018
diff --git a/.gitmodules b/.gitmodules
@@ -10,18 +10,6 @@
 	path = modules/Localization
 	url = https://github.com/aspnet/Localization.git
 	branch = master
-[submodule "modules/Mvc"]
-	path = modules/Mvc
-	url = https://github.com/aspnet/Mvc.git
-	branch = master
-[submodule "modules/Razor"]
-	path = modules/Razor
-	url = https://github.com/aspnet/Razor.git
-	branch = master
-[submodule "modules/SignalR"]
-	path = modules/SignalR
-	url = https://github.com/aspnet/SignalR.git
-	branch = master
 [submodule "src/IISIntegration/test/gtest/googletest"]
 	path = src/IISIntegration/test/gtest/googletest
 	url = https://github.com/google/googletest
diff --git a/build/buildorder.props b/build/buildorder.props
@@ -7,7 +7,7 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="Razor" Order="6" />
+    <RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
     <RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
     <RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
     <RepositoryBuildOrder Include="Antiforgery" Order="10" RootPath="$(RepositoryRoot)src\Antiforgery\" />
@@ -21,13 +21,13 @@
     <RepositoryBuildOrder Include="Localization" Order="13" />
     <RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
     <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
-    <RepositoryBuildOrder Include="Mvc" Order="14" />
+    <RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
     <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <RepositoryBuildOrder Include="Identity" Order="15" />
     <RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
-    <RepositoryBuildOrder Include="SignalR" Order="16" />
+    <RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
     <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>

diff --git a/build/submodules.props b/build/submodules.props
@@ -47,13 +47,13 @@
     <Repository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <Repository Include="Localization" />
     <Repository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
-    <Repository Include="Mvc" />
-    <Repository Include="Razor" />
+    <Repository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
+    <Repository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
     <Repository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
     <Repository Include="Routing" RootPath="$(RepositoryRoot)src\Routing\" />
     <Repository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
     <Repository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
-    <Repository Include="SignalR" />
+    <Repository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
     <Repository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
     <Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
 

diff --git a/modules/Mvc b/modules/Mvc
diff --git a/modules/Razor b/modules/Razor
diff --git a/modules/SignalR b/modules/SignalR
diff --git a/src/Mvc/.editorconfig b/src/Mvc/.editorconfig
@@ -0,0 +1,56 @@
+# EditorConfig is awesome:http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Don't use tabs for indentation.
+[*]
+indent_style = space
+# (Please don't specify an indent_size here; that has too many unintended consequences.)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# Xml config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON files
+[*.json]
+indent_size = 2
+
+# Dotnet code style settings:
+[*.cs]
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+
+# Don't use this. qualifier
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+
+# use int x = .. over Int32
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+# use int.MaxValue over Int32.MaxValue
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Require var all the time.
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Disallow throw expressions.
+csharp_style_throw_expression = false:suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
diff --git a/src/Mvc/.gitignore b/src/Mvc/.gitignore
@@ -0,0 +1,42 @@
+[Oo]bj/
+[Bb]in/
+TestResults/
+.nuget/
+.build/
+.testPublish/
+*.sln.ide/
+_ReSharper.*/
+packages/
+artifacts/
+PublishProfiles/
+.vs/
+bower_components/
+node_modules/
+debugSettings.json
+project.lock.json
+*.user
+*.suo
+*.cache
+*.docstates
+_ReSharper.*
+nuget.exe
+*net45.csproj
+*net451.csproj
+*k10.csproj
+*.psess
+*.vsp
+*.pidb
+*.userprefs
+*DS_Store
+*.ncrunchsolution
+*.*sdf
+*.ipch
+.settings
+*.sln.ide
+node_modules
+*launchSettings.json
+*.orig
+.vscode/
+BenchmarkDotNet.Artifacts/
+.idea/
+msbuild.binlog
diff --git a/src/Mvc/Directory.Build.props b/src/Mvc/Directory.Build.props
@@ -0,0 +1,21 @@
+<Project>
+  <Import
+    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
+    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
+
+  <Import Project="version.props" />
+  <Import Project="build\dependencies.props" />
+  <Import Project="build\sources.props" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core MVC</Product>
+    <RepositoryUrl>https://github.com/aspnet/Mvc</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <UseRoutingFromFeatureBranch>true</UseRoutingFromFeatureBranch>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Mvc/Directory.Build.targets b/src/Mvc/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
+    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+  </PropertyGroup>
+</Project>