Merge branch 'release/2.2'

.gitmodules

@@ -134,10 +134,6 @@
 	path = modules/Options
 	url = https://github.com/aspnet/Options.git
 	branch = master
-[submodule "modules/Proxy"]
-	path = modules/Proxy
-	url = https://github.com/aspnet/Proxy.git
-	branch = master
 [submodule "modules/Razor"]
 	path = modules/Razor
 	url = https://github.com/aspnet/Razor.git

build/artifacts.props

@@ -133,7 +133,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Proxy" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" Category="ship" AppMetapackage="true" AllMetapackage="true"/>

build/buildorder.props

@@ -36,7 +36,6 @@
     <RepositoryBuildOrder Include="Security" Order="13" />
     <RepositoryBuildOrder Include="MetaPackages" Order="13" />
     <RepositoryBuildOrder Include="Mvc" Order="14" />
-    <RepositoryBuildOrder Include="Proxy" Order="14" />
     <RepositoryBuildOrder Include="AADIntegration" Order="15" />
     <RepositoryBuildOrder Include="Identity" Order="15" />
     <RepositoryBuildOrder Include="JavaScriptServices" Order="15" />

build/submodules.props

@@ -66,7 +66,6 @@
     <Repository Include="Microsoft.Data.Sqlite" />
     <Repository Include="Mvc" />
     <Repository Include="Options" />
-    <Repository Include="Proxy" />
     <Repository Include="Razor" />
     <Repository Include="ResponseCaching" />
     <Repository Include="Routing" />

modules/Proxy

@@ -1 +0,0 @@
-Subproject commit 404fcf500bce5fe6a75b2e6b20b40923b0c112a9

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,13 +105,12 @@ 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
+                        $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 = $_