From 904626800a9a6b0f5532076038bed84e69a532cb Mon Sep 17 00:00:00 2001
From: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>
Date: Tue, 8 May 2018 23:11:52 -0500
Subject: [PATCH 1/3] Updating external dependencies (#1157)

---
 build/dependencies.props | 56 ++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 5775fae893..28cfd2c384 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,36 +1,36 @@
 <Project>
   <!-- These package version may be overridden or updated by automation. -->
   <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
-    <MicrosoftCSharpPackageVersion>4.5.0-rtm-26505-03</MicrosoftCSharpPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-rtm-26505-04</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftCSharpPackageVersion>4.5.0-rtm-26508-03</MicrosoftCSharpPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-rtm-26508-02</MicrosoftExtensionsDependencyModelPackageVersion>
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
-    <MicrosoftNETCoreAppPackageVersion>2.1.0-rtm-26505-04</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-rtm-26505-04</MicrosoftNETCoreDotNetAppHostPackageVersion>
-    <MicrosoftWin32RegistryPackageVersion>4.5.0-rtm-26505-03</MicrosoftWin32RegistryPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.0-rtm-26508-02</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-rtm-26508-02</MicrosoftNETCoreDotNetAppHostPackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>4.5.0-rtm-26508-03</MicrosoftWin32RegistryPackageVersion>
     <NuGetFrameworksPackageVersion>4.7.0-rtm.5148</NuGetFrameworksPackageVersion>
-    <SystemBuffersPackageVersion>4.5.0-rtm-26505-03</SystemBuffersPackageVersion>
-    <SystemCollectionsImmutablePackageVersion>1.5.0-rtm-26505-03</SystemCollectionsImmutablePackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>4.5.0-rtm-26505-03</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDataSqlClientPackageVersion>4.5.0-rtm-26505-03</SystemDataSqlClientPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-rtm-26505-03</SystemDiagnosticsDiagnosticSourcePackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>4.5.0-rtm-26505-03</SystemDiagnosticsEventLogPackageVersion>
-    <SystemIOPipelinesPackageVersion>4.5.0-rtm-26505-03</SystemIOPipelinesPackageVersion>
-    <SystemMemoryPackageVersion>4.5.0-rtm-26505-03</SystemMemoryPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-rtm-26505-03</SystemNetHttpWinHttpHandlerPackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-rtm-26505-03</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <SystemNumericsVectorsPackageVersion>4.5.0-rtm-26505-03</SystemNumericsVectorsPackageVersion>
-    <SystemReflectionMetadataPackageVersion>1.6.0-rtm-26505-03</SystemReflectionMetadataPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-rtm-26505-03</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>4.5.0-rtm-26505-03</SystemSecurityCryptographyCngPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>4.5.0-rtm-26505-03</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>4.5.0-rtm-26505-03</SystemSecurityPermissionsPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-rtm-26505-03</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemServiceProcessServiceControllerPackageVersion>4.5.0-rtm-26505-03</SystemServiceProcessServiceControllerPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>4.5.0-rtm-26505-03</SystemTextEncodingsWebPackageVersion>
-    <SystemThreadingChannelsPackageVersion>4.5.0-rtm-26505-03</SystemThreadingChannelsPackageVersion>
-    <SystemThreadingTasksDataflowPackageVersion>4.9.0-rtm-26505-03</SystemThreadingTasksDataflowPackageVersion>
-    <SystemThreadingTasksExtensionsPackageVersion>4.5.0-rtm-26505-03</SystemThreadingTasksExtensionsPackageVersion>
-    <SystemValueTuplePackageVersion>4.5.0-rtm-26505-03</SystemValueTuplePackageVersion>
+    <SystemBuffersPackageVersion>4.5.0-rtm-26508-03</SystemBuffersPackageVersion>
+    <SystemCollectionsImmutablePackageVersion>1.5.0-rtm-26508-03</SystemCollectionsImmutablePackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>4.5.0-rtm-26508-03</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDataSqlClientPackageVersion>4.5.0-rtm-26508-03</SystemDataSqlClientPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-rtm-26508-03</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>4.5.0-rtm-26508-03</SystemDiagnosticsEventLogPackageVersion>
+    <SystemIOPipelinesPackageVersion>4.5.0-rtm-26508-03</SystemIOPipelinesPackageVersion>
+    <SystemMemoryPackageVersion>4.5.0-rtm-26508-03</SystemMemoryPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-rtm-26508-03</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-rtm-26508-03</SystemNetWebSocketsWebSocketProtocolPackageVersion>
+    <SystemNumericsVectorsPackageVersion>4.5.0-rtm-26508-03</SystemNumericsVectorsPackageVersion>
+    <SystemReflectionMetadataPackageVersion>1.6.0-rtm-26508-03</SystemReflectionMetadataPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-rtm-26508-03</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>4.5.0-rtm-26508-03</SystemSecurityCryptographyCngPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>4.5.0-rtm-26508-03</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>4.5.0-rtm-26508-03</SystemSecurityPermissionsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-rtm-26508-03</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>4.5.0-rtm-26508-03</SystemServiceProcessServiceControllerPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>4.5.0-rtm-26508-03</SystemTextEncodingsWebPackageVersion>
+    <SystemThreadingChannelsPackageVersion>4.5.0-rtm-26508-03</SystemThreadingChannelsPackageVersion>
+    <SystemThreadingTasksDataflowPackageVersion>4.9.0-rtm-26508-03</SystemThreadingTasksDataflowPackageVersion>
+    <SystemThreadingTasksExtensionsPackageVersion>4.5.0-rtm-26508-03</SystemThreadingTasksExtensionsPackageVersion>
+    <SystemValueTuplePackageVersion>4.5.0-rtm-26508-03</SystemValueTuplePackageVersion>
   </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

From b6ce8e18b292cadb5f2fa1db084221190a6dceee Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 8 May 2018 21:29:43 -0700
Subject: [PATCH 2/3] Remove dotnet-buildtools myget feed

---
 build/sources.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/sources.props b/build/sources.props
index f874dc53b7..9570c654ac 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -21,7 +21,6 @@
       https://vside.myget.org/F/vssdk/api/v3/index.json;
       https://vside.myget.org/F/vsmac/api/v3/index.json;
       https://www.myget.org/F/xunit/api/v3/index.json;
-      https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
 </Project>

From 7bd10b41ba934746f4aeec3d7dbbf9cc4631149b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 8 May 2018 21:37:20 -0700
Subject: [PATCH 3/3] Fix #1145 - set commit author and email

---
 scripts/common.psm1 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/common.psm1 b/scripts/common.psm1
index e99d9a0881..7a1fb5011f 100644
--- a/scripts/common.psm1
+++ b/scripts/common.psm1
@@ -171,7 +171,16 @@ function CommitUpdatedVersions(
 
         $subject = "Updating external dependencies"
 
-        Invoke-Block { & git commit -m $subject } | Out-Null
+        $gitConfigArgs = @()
+        if ($env:GITHUB_USER) {
+            $gitConfigArgs += '-c',"user.name=$env:GITHUB_USER"
+        }
+
+        if ($env:GITHUB_EMAIL) {
+            $gitConfigArgs += '-c',"user.email=$env:GITHUB_EMAIL"
+        }
+
+        Invoke-Block { & git @gitConfigArgs commit -m $subject } | Out-Null
 
         $body = "$subject`n`n"