From 9ad9ada9eac58565c495a0316dd393f3605559ee Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 9 Jul 2018 18:16:57 -0700 Subject: [PATCH] Pin to the latest stable 2.1.x corefx packages --- build/dependencies.props | 54 +++++++++++++++++----------------- scripts/UpdateDependencies.ps1 | 25 +++++++++------- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3100414460..c336b4ea34 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,36 +1,10 @@ - + - 4.6.0-preview1-26617-01 2.2.0-preview1-26618-02 2.2.0-preview1-26618-02 2.2.0-preview1-26618-02 - 4.6.0-preview1-26617-01 - 4.8.0-preview1.5116 - 4.6.0-preview1-26617-01 - 1.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 1.7.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.10.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 @@ -84,6 +58,7 @@ 2.8.0 2.8.0 2.8.0 + 4.5.0 1.7.0 0.2.0-beta-63019-01 1.0.0-rc3-003121 @@ -119,6 +94,7 @@ 15.6.161-preview 11.1.0 1.4.0 + 4.5.0 1.3.8 1.0.1 4.7.49 @@ -126,6 +102,7 @@ 2.0.3 1.0.1 11.0.2 + 4.7.0 12.2.1100 2.0.1 6.0.1 @@ -138,12 +115,35 @@ 1.2.6 1.1.92 1.0.0 + 4.5.0 + 1.5.0 + 4.5.0 + 4.5.1 + 4.5.0 + 4.5.0 5.2.0 3.1.1 + 4.5.0 + 4.5.1 4.3.2 + 4.5.0 + 4.5.1 + 4.5.0 3.1.1 4.3.0 + 1.6.0 + 4.5.1 4.3.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.9.0 + 4.5.1 + 4.5.0 1.3.7 9.0.1 2.9.0-beta4-62911-02 diff --git a/scripts/UpdateDependencies.ps1 b/scripts/UpdateDependencies.ps1 index 8708eee27b..7aeb8fd3f8 100755 --- a/scripts/UpdateDependencies.ps1 +++ b/scripts/UpdateDependencies.ps1 @@ -54,23 +54,28 @@ foreach ($package in $remoteDeps.SelectNodes('//Package')) { } } +if (-not $NoCommit) { + $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } -$currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } - -$destinationBranch = "dotnetbot/UpdateDeps" -Invoke-Block { & git checkout -tb $destinationBranch "origin/$GithubUpstreamBranch" } + $destinationBranch = "dotnetbot/UpdateDeps" + Invoke-Block { & git checkout -tb $destinationBranch "origin/$GithubUpstreamBranch" } +} try { $updatedVars = UpdateVersions $variables $dependencies $depsPath - if (-not $NoCommit) { - $body = CommitUpdatedVersions $updatedVars $dependencies $depsPath + if ($NoCommit) { + exit 0 + } - if ($body) { - CreatePR "aspnet" $GithubUsername $GithubUpstreamBranch $destinationBranch $body $GithubToken - } + $body = CommitUpdatedVersions $updatedVars $dependencies $depsPath + + if ($body) { + CreatePR "aspnet" $GithubUsername $GithubUpstreamBranch $destinationBranch $body $GithubToken } } finally { - Invoke-Block { & git checkout $currentBranch } + if (-not $NoCommit) { + Invoke-Block { & git checkout $currentBranch } + } }