1.1.2 patch train updates (aspnet#274)

* 1.1.2 patch train updates * Update global.json and NuGet.config * Update Microsoft.NETCore.App to 1.1.1 * Update build scripts
Andotnet · Feb 15, 2017 · 09761ed · 09761ed
1 parent 8eb752f
commit 09761ed
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 44 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,8 @@
 {
-    "projects": ["src"]
-}
+  "projects": [
+    "src"
+  ],
+  "sdk": {
+    "version": "1.0.0-preview2-1-003177"
+  }
+}
diff --git a/samples/MemoryCacheConcurencySample/project.json b/samples/MemoryCacheConcurencySample/project.json
@@ -3,14 +3,14 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Memory": "1.1.0"
+    "Microsoft.Extensions.Caching.Memory": "1.1.1"
   },
   "frameworks": {
     "net451": {},
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/samples/MemoryCacheFileWatchSample/project.json b/samples/MemoryCacheFileWatchSample/project.json
@@ -3,15 +3,15 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Memory": "1.1.0",
+    "Microsoft.Extensions.Caching.Memory": "1.1.1",
     "Microsoft.Extensions.FileProviders.Physical": "1.1.0"
   },
   "frameworks": {
     "net451": {},
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/samples/MemoryCacheSample/project.json b/samples/MemoryCacheSample/project.json
@@ -3,14 +3,14 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Memory": "1.1.0"
+    "Microsoft.Extensions.Caching.Memory": "1.1.1"
   },
   "frameworks": {
     "net451": {},
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/samples/ProfilingSample/project.json b/samples/ProfilingSample/project.json
@@ -3,14 +3,14 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Memory": "1.1.0"
+    "Microsoft.Extensions.Caching.Memory": "1.1.1"
   },
   "frameworks": {
     "net451": {},
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/samples/RedisCacheSample/project.json b/samples/RedisCacheSample/project.json
@@ -3,14 +3,14 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Redis": "1.1.0"
+    "Microsoft.Extensions.Caching.Redis": "1.1.1"
   },
   "frameworks": {
     "net451": {},
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/samples/SqlServerCacheConcurencySample/project.json b/samples/SqlServerCacheConcurencySample/project.json
@@ -3,10 +3,10 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.SqlServer": "1.1.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
-    "Microsoft.Extensions.Options": "1.1.0",
+    "Microsoft.Extensions.Caching.SqlServer": "1.1.1",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
+    "Microsoft.Extensions.Configuration.Json": "1.1.1",
+    "Microsoft.Extensions.Options": "1.1.1",
     "Microsoft.Extensions.PlatformAbstractions": "1.1.0"
   },
   "publishOptions": {
@@ -19,7 +19,7 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/samples/SqlServerCacheSample/project.json b/samples/SqlServerCacheSample/project.json
@@ -3,9 +3,9 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.SqlServer": "1.1.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
+    "Microsoft.Extensions.Caching.SqlServer": "1.1.1",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
+    "Microsoft.Extensions.Configuration.Json": "1.1.1",
     "Microsoft.Extensions.PlatformAbstractions": "1.1.0"
   },
   "publishOptions": {
@@ -18,7 +18,7 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/src/Microsoft.Extensions.Caching.Abstractions/project.json b/src/Microsoft.Extensions.Caching.Abstractions/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",

diff --git a/src/Microsoft.Extensions.Caching.Memory/project.json b/src/Microsoft.Extensions.Caching.Memory/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.",
   "packOptions": {
     "repository": {
@@ -20,9 +20,9 @@
     "xmlDoc": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Abstractions": "1.1.0",
+    "Microsoft.Extensions.Caching.Abstractions": "1.1.1",
     "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0",
-    "Microsoft.Extensions.Options": "1.1.0",
+    "Microsoft.Extensions.Options": "1.1.1",
     "NETStandard.Library": "1.6.1"
   },
   "frameworks": {

diff --git a/src/Microsoft.Extensions.Caching.Redis/project.json b/src/Microsoft.Extensions.Caching.Redis/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Redis.",
   "packOptions": {
     "repository": {
@@ -21,8 +21,8 @@
     "xmlDoc": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Abstractions": "1.1.0",
-    "Microsoft.Extensions.Options": "1.1.0",
+    "Microsoft.Extensions.Caching.Abstractions": "1.1.1",
+    "Microsoft.Extensions.Options": "1.1.1",
     "NETStandard.Library": "1.6.1",
     "StackExchange.Redis.StrongName": "1.1.605"
   },

diff --git a/src/Microsoft.Extensions.Caching.SqlServer/project.json b/src/Microsoft.Extensions.Caching.SqlServer/project.json
@@ -1,8 +1,8 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "dependencies": {
-    "Microsoft.Extensions.Caching.Abstractions": "1.1.0",
-    "Microsoft.Extensions.Options": "1.1.0",
+    "Microsoft.Extensions.Caching.Abstractions": "1.1.1",
+    "Microsoft.Extensions.Options": "1.1.1",
     "NETStandard.Library": "1.6.1"
   },
   "description": "Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Microsoft SQL Server.",

diff --git a/test/Microsoft.Extensions.Caching.Memory.Tests/project.json b/test/Microsoft.Extensions.Caching.Memory.Tests/project.json
@@ -6,15 +6,15 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-rtm-22752",
-    "Microsoft.Extensions.Caching.Memory": "1.1.0",
+    "Microsoft.Extensions.Caching.Memory": "1.1.1",
     "Microsoft.Extensions.DependencyInjection": "1.1.0",
     "xunit": "2.2.0-*"
   },
   "frameworks": {
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/test/Microsoft.Extensions.Caching.Redis.Tests/project.json b/test/Microsoft.Extensions.Caching.Redis.Tests/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-rtm-22752",
-    "Microsoft.Extensions.Caching.Redis": "1.1.0",
+    "Microsoft.Extensions.Caching.Redis": "1.1.1",
     "Microsoft.Extensions.DependencyInjection": "1.1.0",
     "Moq": "4.6.36-*",
     "xunit": "2.2.0-*"
@@ -12,7 +12,7 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         }
       }

diff --git a/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json b/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json
@@ -6,9 +6,9 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-rtm-22752",
-    "Microsoft.Extensions.Caching.SqlServer": "1.1.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
+    "Microsoft.Extensions.Caching.SqlServer": "1.1.1",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
+    "Microsoft.Extensions.Configuration.Json": "1.1.1",
     "Microsoft.Extensions.DependencyInjection": "1.1.0",
     "Moq": "4.6.36-*",
     "xunit": "2.2.0-*"
@@ -22,7 +22,7 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "type": "platform"
         },
         "System.Diagnostics.TraceSource": "4.3.0"