diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index 67ce4c9c9d..26ce3169ae 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-servicing-02221-03
+2.0.0-servicing-02312-03
diff --git a/NuGet.Config b/NuGet.Config
index 1fa93e909d..38c83035b9 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,5 +5,6 @@
+
diff --git a/repos/cli.proj b/repos/cli.proj
index 752f3c62a2..dc784a2071 100644
--- a/repos/cli.proj
+++ b/repos/cli.proj
@@ -4,7 +4,7 @@
'/p:CLITargets=\"\"\"Prepare;Compile;Package\"\"\"'
'/p:CLITargets="Prepare;Compile;Package"'
- $(ProjectDirectory)build$(ShellExtension) $(CLITargetsArgument) /v:detailed /p:SkipBuildingInstallers=true /p:IncludeNuGetPackageArchive=false /p:IncludeAdditionalSharedFrameworks=false /flp:v=detailed /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) /p:UsePortableLinuxSharedFramework=false /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false /p:IncludeAspNetCoreRuntime=false /p:IncludeMSBuildSdkResolver=false
+ $(ProjectDirectory)build$(ShellExtension) $(CLITargetsArgument) /v:detailed /p:SkipBuildingInstallers=true /p:IncludeNuGetPackageArchive=false /p:IncludeAdditionalSharedFrameworks=false /flp:v=detailed /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) /p:ExternalRestoreSources=$(SourceBuiltPackagesPath) /p:UsePortableLinuxSharedFramework=false /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false /p:IncludeAspNetCoreRuntime=false /p:IncludeMSBuildSdkResolver=false
$(ProjectDirectory)artifacts/linux-x64/packages/
$(PackagesOutput)
6908
diff --git a/repos/core-setup.proj b/repos/core-setup.proj
index 65b67c022e..fa4426701e 100644
--- a/repos/core-setup.proj
+++ b/repos/core-setup.proj
@@ -4,7 +4,7 @@
-ConfigurationGroup=$(Configuration) -PortableBuild=false -SkipTests=true
$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true
- $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false
+ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true
$(ArmEnvironmentVariables) $(BuildCommand)
82b22fa44e46d624ebeddf156f33e9cfb317bd57
2017-07-20
diff --git a/repos/corefx.proj b/repos/corefx.proj
index 24d22e04b7..59a15f0c07 100644
--- a/repos/corefx.proj
+++ b/repos/corefx.proj
@@ -2,7 +2,7 @@
- $(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -portable=false -- /p:ILLinkTrimAssembly=false
+ $(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -portable=false -BuildTests=false -- /p:ILLinkTrimAssembly=false
$(ArmEnvironmentVariables) $(BuildCommand)
$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -Framework=netfx -OSGroup=Windows_NT -- /p:ILLinkTrimAssembly=false
$(ProjectDirectory)/bin/packages/$(Configuration)
diff --git a/src/cli b/src/cli
index b18db61594..7fa7f6c89b 160000
--- a/src/cli
+++ b/src/cli
@@ -1 +1 @@
-Subproject commit b18db615946288f2f9028dfe333d775b7f180598
+Subproject commit 7fa7f6c89b40a3e4edb3865d03ebeb4f2002e977
diff --git a/src/core-setup b/src/core-setup
index 1732b0ab67..7c54c3ccb3 160000
--- a/src/core-setup
+++ b/src/core-setup
@@ -1 +1 @@
-Subproject commit 1732b0ab678f1460cfb94d8688077edcb7c8d0f1
+Subproject commit 7c54c3ccb3da9f44abd4339f878462491448128a
diff --git a/src/coreclr b/src/coreclr
index 0e39e2118f..fcdc1ecab6 160000
--- a/src/coreclr
+++ b/src/coreclr
@@ -1 +1 @@
-Subproject commit 0e39e2118f2a5bfd7d0c96e2d289e70823d6d1d4
+Subproject commit fcdc1ecab67568ea26ac03ee20e1da616d81ff1b
diff --git a/src/corefx b/src/corefx
index 091277427f..62a413228e 160000
--- a/src/corefx
+++ b/src/corefx
@@ -1 +1 @@
-Subproject commit 091277427f67e2f9fc25c78d5640ea3a930ace72
+Subproject commit 62a413228e3f79b6d2eb854f50824b9e38bfdef1
diff --git a/src/standard b/src/standard
index f521a0ed6b..330eb8d167 160000
--- a/src/standard
+++ b/src/standard
@@ -1 +1 @@
-Subproject commit f521a0ed6bcf6326bee829bc478c9e6529c2b0e2
+Subproject commit 330eb8d1678c95759fba4727e13fb7531c118727