From 959486df533b27db89661a202aeda74eeab760ca Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 8 Nov 2017 22:13:12 -0800 Subject: [PATCH 1/6] Updating submodule(s) Common => 07f1348725c4fbdb1a147fb8306bbb3ccf726ff7 [auto-updated: submodules] --- modules/Common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Common b/modules/Common index f08c6c3c58..07f1348725 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit f08c6c3c588a621bef902a03e4eea88a287be28a +Subproject commit 07f1348725c4fbdb1a147fb8306bbb3ccf726ff7 From 277d7f2c81d93e163d8e77cbcb32dd008005f022 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Nov 2017 08:53:47 -0800 Subject: [PATCH 2/6] Update ANCM (#635) --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index f72f6fb109..e981972fa9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -111,7 +111,7 @@ - + From a5293eeca571d71a7f0d6deddf6e480c85e9946d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 9 Nov 2017 10:16:27 -0800 Subject: [PATCH 3/6] Add Microsoft.AspNetCore.SpaServices.Extensions --- build/artifacts.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/artifacts.props b/build/artifacts.props index acf749a292..bd59fabd6d 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -139,6 +139,7 @@ + From 476a3835399427b6c3ccbdbdf6e67e89a0c37c20 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 9 Nov 2017 10:33:04 -0800 Subject: [PATCH 4/6] Add mirrored artifacts to restore sources for repo builds --- build/repo.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/repo.targets b/build/repo.targets index 5c6e445532..177671176f 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -162,6 +162,12 @@ SourceName="Artifacts" Condition="%(Repository.Build)" SourceUri="$(BuildDir)" /> + + From 3a764a518f21ace1dc7be7ede643d0861113883e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 9 Nov 2017 10:56:09 -0800 Subject: [PATCH 5/6] Updating submodule(s) Common => 388c04ce5cb242865c432c481b23b85e14c7ce68 EntityFrameworkCore => 2197ef2c0dcc06fa162b0525d66757ad52e01257 JavaScriptServices => 0c77224f46dd6a0f3d72352a5a44d0d6abee3e22 Mvc => bb07119b4ae3d5c8239187e0e4a50fd06d922440 [auto-updated: submodules] --- modules/Common | 2 +- modules/EntityFrameworkCore | 2 +- modules/JavaScriptServices | 2 +- modules/Mvc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/Common b/modules/Common index 07f1348725..388c04ce5c 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 07f1348725c4fbdb1a147fb8306bbb3ccf726ff7 +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 From 05a47756338af032e07745d93f43f728f1a8b918 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 9 Nov 2017 10:51:00 -0800 Subject: [PATCH 6/6] Use Universe's version of KoreBuild --- scripts/UpdateRepos.ps1 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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)"