From 26eecf5d928e8e4c33b14403d50590305092b591 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Wed, 10 Oct 2018 08:57:30 -0700 Subject: [PATCH] Merge release/2.2 to master --- build/dependencies.props | 3 ++- scripts/UpdateRepos.ps1 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 359e225689..270216d51f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -125,7 +125,7 @@ 4.3.0.1 1.3.8 1.0.1 - 4.9.0 + 4.10.0 1.6.1 2.0.3 1.15.1 @@ -147,6 +147,7 @@ 1.1.11 1.1.11 1.2.6 + 2.0.513 1.3.23 1.0.0 5.2.0 diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index a3362a2bd2..c4291f2190 100755 --- a/scripts/UpdateRepos.ps1 +++ b/scripts/UpdateRepos.ps1 @@ -110,7 +110,7 @@ try { Invoke-Block { & git @gitConfigArgs push origin HEAD:$newBranch} } catch { - Write-Warning "Error in pushing $newBranch: $_" + Write-Warning "Error in pushing $($newBranch): $_" $build_errors += @{ Repo = $submodule.module Message = $_