From e4f0d050a81fd515e2aee7e4a0f431b27896b773 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 9 Oct 2018 19:06:36 +0000 Subject: [PATCH 1/4] Updating submodule(s) Diagnostics => 1f31e0556d7cfb7fc99c6c8650173d0cc4ba0717 Hosting => 27e4e1aca3863389098b9be6dd9c5b7c030180b8 IISIntegration => 23db53eae664db68ff3e8d3bd5051ae5a80988ca KestrelHttpServer => 8bca6b3877ed743485e6d9e2ea38d07d60c43a5b MetaPackages => f13f262bad34212446bbb27d7c8c6d49aeec8abf Mvc => 6cee2431f1d5247ea2f5de7af5198f3c328015cc Routing => 7b16053f27ac982eb71317fa8072b55c443aa158 SignalR => f87d8b4aaf17a8f31b4e6f8ad577c4c293d6505e [auto-updated: submodules] --- modules/Diagnostics | 2 +- modules/Hosting | 2 +- modules/IISIntegration | 2 +- modules/KestrelHttpServer | 2 +- modules/MetaPackages | 2 +- modules/Mvc | 2 +- modules/Routing | 2 +- modules/SignalR | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/Diagnostics b/modules/Diagnostics index 9722d89572..1f31e0556d 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 9722d895724f6af65812873b57fdf38378013f57 +Subproject commit 1f31e0556d7cfb7fc99c6c8650173d0cc4ba0717 diff --git a/modules/Hosting b/modules/Hosting index dd2056ae1a..27e4e1aca3 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit dd2056ae1afdc729adfea584d7de79ef7f1534c0 +Subproject commit 27e4e1aca3863389098b9be6dd9c5b7c030180b8 diff --git a/modules/IISIntegration b/modules/IISIntegration index 71262846bf..23db53eae6 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 71262846bf5aa26a767766a299689a42f1e77a37 +Subproject commit 23db53eae664db68ff3e8d3bd5051ae5a80988ca diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 6164ec7225..8bca6b3877 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 6164ec72253238f6b57e3ab71c9fa9d949dc67d1 +Subproject commit 8bca6b3877ed743485e6d9e2ea38d07d60c43a5b diff --git a/modules/MetaPackages b/modules/MetaPackages index 4347a45f29..f13f262bad 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 4347a45f292fe340a5e78c9afddde7e6d2f3dd29 +Subproject commit f13f262bad34212446bbb27d7c8c6d49aeec8abf diff --git a/modules/Mvc b/modules/Mvc index 956441aa68..6cee2431f1 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 956441aa68ce7516bce69fda616a0fe060c83882 +Subproject commit 6cee2431f1d5247ea2f5de7af5198f3c328015cc diff --git a/modules/Routing b/modules/Routing index ce9ace84fd..7b16053f27 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit ce9ace84fd8a4bc9092dd7cb5738296f4dfc6cef +Subproject commit 7b16053f27ac982eb71317fa8072b55c443aa158 diff --git a/modules/SignalR b/modules/SignalR index 813a9e68bc..f87d8b4aaf 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 813a9e68bc6248113d88377e37879b9e6a5aef67 +Subproject commit f87d8b4aaf17a8f31b4e6f8ad577c4c293d6505e From 2948972bfb2751862e1255b3843093723b07b0cd Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 9 Oct 2018 10:47:23 -0700 Subject: [PATCH 2/4] Revert "Update repos send PRs" This reverts commit 1593966f3bd183491162b5a505110ecc7e4bc9b5. --- scripts/UpdateRepos.ps1 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index 8a59675c8e..24b921b867 100755 --- a/scripts/UpdateRepos.ps1 +++ b/scripts/UpdateRepos.ps1 @@ -31,7 +31,6 @@ param( [switch]$NoPush, [string]$GitAuthorName = $null, [string]$GitAuthorEmail = $null, - [string]$GithubToken = $null, [switch]$Force, [string[]]$GitCommitArgs = @() ) @@ -44,7 +43,14 @@ Import-Module "$PSScriptRoot/common.psm1" -Scope Local -Force $RepoRoot = Resolve-Path "$PSScriptRoot\.." $ModuleDirectory = Join-Path $RepoRoot "modules" -Set-GitHubInfo $GithubToken $GitAuthorName $GitAuthorEmail +$gitConfigArgs = @() +if ($GitAuthorName) { + $gitConfigArgs += '-c', "user.name=$GitAuthorName" +} + +if ($GitAuthorEmail) { + $gitConfigArgs += '-c', "user.email=$GitAuthorEmail" +} Push-Location $ModuleDirectory try { @@ -73,13 +79,12 @@ try { 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 add $depsFile $koreBuildLock } + Invoke-Block { & git @gitConfigArgs add $depsFile $koreBuildLock } # If there were any changes test and push. & git diff --cached --quiet ./ - $msgBody = "Update dependencies.props`n`n[auto-updated: dependencies]" if ($LASTEXITCODE -ne 0) { - Invoke-Block { & git commit --quiet -m $msgBody @GitCommitArgs } + Invoke-Block { & git @gitConfigArgs commit --quiet -m "Update dependencies.props`n`n[auto-updated: dependencies]" @GitCommitArgs } # Prepare this submodule for push $sshUrl = "git@github.com:aspnet/$($submodule.module)" @@ -100,10 +105,8 @@ try { # Push the changes if (-not $NoPush -and ($Force -or ($PSCmdlet.ShouldContinue("Pushing updates to repos.", 'Push the changes to these repos?')))) { - $baseBranch = $submodule.branch - $upgradeBranch = "$baseBranch/upgrade-deps" try { - CreatePR "aspnet" $GithubUsername $baseBranch $upgradeBranch $msgBody $GithubToken + Invoke-Block { & git @gitConfigArgs push origin HEAD:$($submodule.branch)} } catch { Write-Warning "Error in pushing $($submodule.module): $_" From f65c1a4e3de054f10f318cf09a3678dc85618d77 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 9 Oct 2018 11:54:24 -0700 Subject: [PATCH 3/4] Push UpdateRepos to maestro branch --- scripts/UpdateRepos.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index 24b921b867..a3362a2bd2 100755 --- a/scripts/UpdateRepos.ps1 +++ b/scripts/UpdateRepos.ps1 @@ -106,10 +106,11 @@ try { # Push the changes if (-not $NoPush -and ($Force -or ($PSCmdlet.ShouldContinue("Pushing updates to repos.", 'Push the changes to these repos?')))) { try { - Invoke-Block { & git @gitConfigArgs push origin HEAD:$($submodule.branch)} + $newBranch = "maestro/$($submodule.branch)" + Invoke-Block { & git @gitConfigArgs push origin HEAD:$newBranch} } catch { - Write-Warning "Error in pushing $($submodule.module): $_" + Write-Warning "Error in pushing $newBranch: $_" $build_errors += @{ Repo = $submodule.module Message = $_ From 8e13235732e0a73c2c8397ea377c65e513c99c94 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 9 Oct 2018 13:16:03 -0700 Subject: [PATCH 4/4] Remove the Proxy submodule (#1471) Part of https://github.com/aspnet/AspNetCore/issues/3598 - unifying and reducing repos. Proxy does not ship, so its code will move to aspnet/AspLabs. --- .gitmodules | 4 ---- build/artifacts.props | 1 - build/buildorder.props | 1 - build/submodules.props | 1 - modules/Proxy | 1 - 5 files changed, 8 deletions(-) delete mode 160000 modules/Proxy diff --git a/.gitmodules b/.gitmodules index c2970f34c1..e50d65490b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,10 +138,6 @@ path = modules/Options url = https://github.com/aspnet/Options.git branch = release/2.2 -[submodule "modules/Proxy"] - path = modules/Proxy - url = https://github.com/aspnet/Proxy.git - branch = release/2.2 [submodule "modules/Razor"] path = modules/Razor url = https://github.com/aspnet/Razor.git diff --git a/build/artifacts.props b/build/artifacts.props index 3696cb9977..9b5f29e524 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -134,7 +134,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index ca08cb52e1..54603518d7 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -36,7 +36,6 @@ - diff --git a/build/submodules.props b/build/submodules.props index a0e6ffe5ca..3495ffa169 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -67,7 +67,6 @@ - diff --git a/modules/Proxy b/modules/Proxy deleted file mode 160000 index 909581d7f4..0000000000 --- a/modules/Proxy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 909581d7f46df5ca00d8e9e6650f805ee7bf8c31