Merge branch 'release/3.0.100-preview8' into merge_release/3.0.100-pr…

…eview8_into_release/3.0.1xx * release/3.0.100-preview8: Update dependencies from https://github.com/dotnet/core-setup build 20190805.07 (dotnet#3507) Insert NuGet Build 5.3.0-preview.2.6136 into sdk (dotnet#3494) [release/3.0.100-preview8] Update dependencies from dotnet/core-setup (dotnet#3491) Update dependencies from https://github.com/dotnet/core-setup build 20190729.14 (dotnet#3483) Conflicts: eng/Version.Details.xml eng/Versions.props
livarcocc · Aug 13, 2019 · aabb66f · aabb66f
2 parents 781e1b1 + 7c9956b
commit aabb66f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -18,7 +18,7 @@
     <MicrosoftNETHostModelVersion>3.0.0-preview9-19407-10</MicrosoftNETHostModelVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
-    <NuGetBuildTasksPackVersion>5.3.0-preview.2.6103</NuGetBuildTasksPackVersion>
+    <NuGetBuildTasksPackVersion>5.3.0-preview.2.6136</NuGetBuildTasksPackVersion>
     <NuGetPackagingVersion>$(NuGetBuildTasksPackVersion)</NuGetPackagingVersion>
     <NuGetProjectModelVersion>$(NuGetBuildTasksPackVersion)</NuGetProjectModelVersion>
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-013499",
+    "dotnet": "3.0.100-preview8-013625",
     "vs-opt": {
       "version": "15.9"
     }