diff --git a/build/artifacts.props b/build/artifacts.props index 71a1c7a7cc..a7e8a039c7 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -142,6 +142,7 @@ + diff --git a/build/dependencies.props b/build/dependencies.props index 01619333ab..ce007a5957 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -138,7 +138,7 @@ - + diff --git a/build/repo.targets b/build/repo.targets index c9439e4dc9..3860311efd 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -179,6 +179,12 @@ SourceName="Artifacts" Condition="%(Repository.Build)" SourceUri="$(BuildDir)" /> + + diff --git a/modules/Common b/modules/Common index f08c6c3c58..388c04ce5c 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit f08c6c3c588a621bef902a03e4eea88a287be28a +Subproject commit 388c04ce5cb242865c432c481b23b85e14c7ce68 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index c81d716cc2..2197ef2c0d 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit c81d716cc27013d6ff5ca3eb5fa60cdbaa782bd3 +Subproject commit 2197ef2c0dcc06fa162b0525d66757ad52e01257 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 7bf5516bb2..0c77224f46 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 7bf5516bb2c09f85fe6d5e5acacd9aad245ee2db +Subproject commit 0c77224f46dd6a0f3d72352a5a44d0d6abee3e22 diff --git a/modules/Mvc b/modules/Mvc index d9825d1547..bb07119b4a 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit d9825d1547e51619c0e4d6eba710c1f67172e136 +Subproject commit bb07119b4ae3d5c8239187e0e4a50fd06d922440 diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index 02370e54a7..d43818bb26 100755 --- a/scripts/UpdateRepos.ps1 +++ b/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)"