1.1.2 patch train updates (#67)

* 1.1.2 patch train updates * Update global.json and NuGet.config * Update Microsoft.NETCore.App to 1.1.1 * Update build scripts
aspnet · Feb 15, 2017 · c8c545e · c8c545e
1 parent 7a487a8
commit c8c545e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -4,5 +4,6 @@
     <clear />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
     <add key="AspNetCore" value="https://dotnet.myget.org/f/aspnetcore-master/api/v3/index.json" />
+    <add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnet-1-1-1-patch/api/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/build.ps1 b/build.ps1
@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP
@@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
     }
 }
 
-&"$buildFile" $args
+&"$buildFile" $args
diff --git a/build.sh b/build.sh
@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi
@@ -43,4 +43,4 @@ if test ! -d $buildFolder; then
     fi
 fi
 
-$buildFile -r $repoFolder "$@"
+$buildFile -r $repoFolder "$@"
diff --git a/global.json b/global.json
@@ -1,3 +1,10 @@
 {
-    "projects": ["src", "test/WebSites", "samples"]
-}
+  "projects": [
+    "src",
+    "test/WebSites",
+    "samples"
+  ],
+  "sdk": {
+    "version": "1.0.0-preview2-1-003177"
+  }
+}
diff --git a/src/Microsoft.AspNetCore.JsonPatch/project.json b/src/Microsoft.AspNetCore.JsonPatch/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "ASP.NET Core support for JSON PATCH.",
   "buildOptions": {
     "warningsAsErrors": true,

diff --git a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json
@@ -4,7 +4,7 @@
   },
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
-    "Microsoft.AspNetCore.JsonPatch": "1.1.0",
+    "Microsoft.AspNetCore.JsonPatch": "1.1.1",
     "Microsoft.AspNetCore.Testing": "1.1.0-rtm-22752",
     "Moq": "4.6.36-*",
     "xunit": "2.2.0-*"
@@ -14,7 +14,7 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         },
         "System.Diagnostics.TraceSource": "4.3.0"