Merge branch 'dev' into namc/merge-rel-2.0.3

build/artifacts.props

@@ -142,6 +142,7 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Common.Http" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Http" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.SpaServices.Extensions" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />

build/dependencies.props

@@ -138,7 +138,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-pre-10141" Source="$(AspNetCoreModuleFeed)" Private="true" Mirror="true" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-pre-10196" Source="$(AspNetCoreModuleFeed)" Private="true" Mirror="true" />
   </ItemGroup>
 
   <!-- nuget.org -->

build/repo.targets

@@ -179,6 +179,12 @@
       SourceName="Artifacts"
       Condition="%(Repository.Build)"
       SourceUri="$(BuildDir)" />
+    
+    <UpdatePackageSource
+      NuGetConfigPath="%(Repository.RootPath)NuGet.config"
+      SourceName="MirroredArtifacts"
+      Condition="%(Repository.Build)"
+      SourceUri="$(IntermediateMirrorPackageDir)" />
   </Target>
 
   <Target Name="SplitPackages">

modules/Common

@@ -1 +1 @@
-Subproject commit f08c6c3c588a621bef902a03e4eea88a287be28a
+Subproject commit 388c04ce5cb242865c432c481b23b85e14c7ce68

modules/EntityFrameworkCore

@@ -1 +1 @@
-Subproject commit c81d716cc27013d6ff5ca3eb5fa60cdbaa782bd3
+Subproject commit 2197ef2c0dcc06fa162b0525d66757ad52e01257

modules/JavaScriptServices

@@ -1 +1 @@
-Subproject commit 7bf5516bb2c09f85fe6d5e5acacd9aad245ee2db
+Subproject commit 0c77224f46dd6a0f3d72352a5a44d0d6abee3e22

modules/Mvc

@@ -1 +1 @@
-Subproject commit d9825d1547e51619c0e4d6eba710c1f67172e136
+Subproject commit bb07119b4ae3d5c8239187e0e4a50fd06d922440

scripts/UpdateRepos.ps1

@@ -72,10 +72,17 @@ try {
                 continue
             }
 
-            Write-Verbose "About to update dependencies.props for $($submodule.module)"
-            & .\run.ps1 -Update upgrade deps --source $Source --id $LineupID --version $LineupVersion --deps-file $depsFile
+            $koreBuildLock = "korebuild-lock.txt"
 
-            Invoke-Block { & git @gitConfigArgs add $depsFile "korebuild-lock.txt" }
+            $universeKoreBuildLock = (Join-Path $RepoRoot $koreBuildLock)
+            $submoduleKoreBuildLock = (Join-Path $submodule.path $koreBuildLock)
+
+            Copy-Item $universeKoreBuildLock $submoduleKoreBuildLock -Force
+
+            Write-Verbose "About to update dependencies.props for $($submodule.module)"
+            & .\run.ps1 upgrade deps --source $Source --id $LineupID --version $LineupVersion --deps-file $depsFile
+
+            Invoke-Block { & git @gitConfigArgs add $depsFile $koreBuildLock }
             Invoke-Block { & git @gitConfigArgs commit --quiet -m "Update dependencies.props`n`n[auto-updated: dependencies]" @GitCommitArgs }
 
             $sshUrl = "git@github.com:aspnet/$($submodule.module)"