From 198e7a6a7d5af60b47e4bd0ddf9b11177540b636 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 10 Feb 2017 15:10:35 -0800 Subject: [PATCH 1/4] 1.0.4 patch train updates --- samples/MemoryCacheConcurencySample/project.json | 2 +- samples/MemoryCacheSample/project.json | 2 +- samples/ProfilingSample/project.json | 2 +- samples/RedisCacheSample/project.json | 2 +- samples/SqlServerCacheConcurencySample/project.json | 8 ++++---- samples/SqlServerCacheSample/project.json | 6 +++--- .../project.json | 2 +- src/Microsoft.Extensions.Caching.Memory/project.json | 6 +++--- src/Microsoft.Extensions.Caching.Redis/project.json | 6 +++--- .../project.json | 6 +++--- src/Microsoft.Extensions.Caching.SqlServer/project.json | 6 +++--- .../project.json | 2 +- .../Microsoft.Extensions.Caching.Redis.Tests/project.json | 2 +- .../project.json | 6 +++--- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/samples/MemoryCacheConcurencySample/project.json b/samples/MemoryCacheConcurencySample/project.json index 45334d8b..fc452cee 100644 --- a/samples/MemoryCacheConcurencySample/project.json +++ b/samples/MemoryCacheConcurencySample/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Extensions.Caching.Memory": "1.0.1" + "Microsoft.Extensions.Caching.Memory": "1.0.2" }, "frameworks": { "net451": {}, diff --git a/samples/MemoryCacheSample/project.json b/samples/MemoryCacheSample/project.json index 45334d8b..fc452cee 100644 --- a/samples/MemoryCacheSample/project.json +++ b/samples/MemoryCacheSample/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Extensions.Caching.Memory": "1.0.1" + "Microsoft.Extensions.Caching.Memory": "1.0.2" }, "frameworks": { "net451": {}, diff --git a/samples/ProfilingSample/project.json b/samples/ProfilingSample/project.json index 45334d8b..fc452cee 100644 --- a/samples/ProfilingSample/project.json +++ b/samples/ProfilingSample/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Extensions.Caching.Memory": "1.0.1" + "Microsoft.Extensions.Caching.Memory": "1.0.2" }, "frameworks": { "net451": {}, diff --git a/samples/RedisCacheSample/project.json b/samples/RedisCacheSample/project.json index 35ad2f2f..eb349fed 100644 --- a/samples/RedisCacheSample/project.json +++ b/samples/RedisCacheSample/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Extensions.Caching.Redis": "1.0.1" + "Microsoft.Extensions.Caching.Redis": "1.0.2" }, "frameworks": { "net451": {} diff --git a/samples/SqlServerCacheConcurencySample/project.json b/samples/SqlServerCacheConcurencySample/project.json index 5b997190..939b5c02 100644 --- a/samples/SqlServerCacheConcurencySample/project.json +++ b/samples/SqlServerCacheConcurencySample/project.json @@ -3,10 +3,10 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Extensions.Caching.SqlServer": "1.0.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.1", - "Microsoft.Extensions.Configuration.Json": "1.0.1", - "Microsoft.Extensions.Options": "1.0.1", + "Microsoft.Extensions.Caching.SqlServer": "1.0.2", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.2", + "Microsoft.Extensions.Configuration.Json": "1.0.2", + "Microsoft.Extensions.Options": "1.0.2", "Microsoft.Extensions.PlatformAbstractions": "1.0.0" }, "publishOptions": { diff --git a/samples/SqlServerCacheSample/project.json b/samples/SqlServerCacheSample/project.json index 1697e073..5ee9910a 100644 --- a/samples/SqlServerCacheSample/project.json +++ b/samples/SqlServerCacheSample/project.json @@ -3,9 +3,9 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Extensions.Caching.SqlServer": "1.0.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.1", - "Microsoft.Extensions.Configuration.Json": "1.0.1", + "Microsoft.Extensions.Caching.SqlServer": "1.0.2", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.2", + "Microsoft.Extensions.Configuration.Json": "1.0.2", "Microsoft.Extensions.PlatformAbstractions": "1.0.0" }, "publishOptions": { diff --git a/src/Microsoft.Extensions.Caching.Abstractions/project.json b/src/Microsoft.Extensions.Caching.Abstractions/project.json index 353c9329..fe35a073 100644 --- a/src/Microsoft.Extensions.Caching.Abstractions/project.json +++ b/src/Microsoft.Extensions.Caching.Abstractions/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.1", + "version": "1.0.2", "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 index 44760f03..dcee3f7e 100644 --- a/src/Microsoft.Extensions.Caching.Memory/project.json +++ b/src/Microsoft.Extensions.Caching.Memory/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.1", + "version": "1.0.2", "description": "In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.", "packOptions": { "repository": { @@ -21,8 +21,8 @@ }, "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.1", - "Microsoft.Extensions.Caching.Abstractions": "1.0.1", - "Microsoft.Extensions.Options": "1.0.1" + "Microsoft.Extensions.Caching.Abstractions": "1.0.2", + "Microsoft.Extensions.Options": "1.0.2" }, "frameworks": { "net451": { diff --git a/src/Microsoft.Extensions.Caching.Redis/project.json b/src/Microsoft.Extensions.Caching.Redis/project.json index f4850dcc..a89e6e5a 100644 --- a/src/Microsoft.Extensions.Caching.Redis/project.json +++ b/src/Microsoft.Extensions.Caching.Redis/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.1", + "version": "1.0.2", "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.0.1", - "Microsoft.Extensions.Options": "1.0.1", + "Microsoft.Extensions.Caching.Abstractions": "1.0.2", + "Microsoft.Extensions.Options": "1.0.2", "StackExchange.Redis.StrongName": "1.0.333" }, "frameworks": { diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json index 14a7a797..724b0c3d 100644 --- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json +++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json @@ -1,9 +1,9 @@ { - "version": "1.0.0-preview4-final", + "version": "1.0.0-preview4-update1", "dependencies": { "Microsoft.Extensions.CommandLineUtils": "1.0.1", - "Microsoft.Extensions.Logging": "1.0.1", - "Microsoft.Extensions.Logging.Console": "1.0.1", + "Microsoft.Extensions.Logging": "1.0.2", + "Microsoft.Extensions.Logging.Console": "1.0.2", "System.Data.SqlClient": "4.1.0" }, "description": "Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.", diff --git a/src/Microsoft.Extensions.Caching.SqlServer/project.json b/src/Microsoft.Extensions.Caching.SqlServer/project.json index 45e0c9c7..b78926b0 100644 --- a/src/Microsoft.Extensions.Caching.SqlServer/project.json +++ b/src/Microsoft.Extensions.Caching.SqlServer/project.json @@ -1,8 +1,8 @@ { - "version": "1.0.1", + "version": "1.0.2", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "1.0.1", - "Microsoft.Extensions.Options": "1.0.1" + "Microsoft.Extensions.Caching.Abstractions": "1.0.2", + "Microsoft.Extensions.Options": "1.0.2" }, "description": "Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Microsoft SQL Server.", "buildOptions": { diff --git a/test/Microsoft.Extensions.Caching.Memory.Tests/project.json b/test/Microsoft.Extensions.Caching.Memory.Tests/project.json index 586ad403..fce46e01 100644 --- a/test/Microsoft.Extensions.Caching.Memory.Tests/project.json +++ b/test/Microsoft.Extensions.Caching.Memory.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Testing": "1.0.1", - "Microsoft.Extensions.Caching.Memory": "1.0.1", + "Microsoft.Extensions.Caching.Memory": "1.0.2", "Microsoft.Extensions.DependencyInjection": "1.0.1", "xunit": "2.1.0" }, diff --git a/test/Microsoft.Extensions.Caching.Redis.Tests/project.json b/test/Microsoft.Extensions.Caching.Redis.Tests/project.json index 67e6174b..4d5a58c4 100644 --- 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": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Testing": "1.0.1", - "Microsoft.Extensions.Caching.Redis": "1.0.1", + "Microsoft.Extensions.Caching.Redis": "1.0.2", "Microsoft.Extensions.DependencyInjection": "1.0.1", "xunit": "2.1.0" }, diff --git a/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json b/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json index a10d57d6..d6828f2b 100644 --- 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": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Testing": "1.0.1", - "Microsoft.Extensions.Caching.SqlServer": "1.0.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.1", - "Microsoft.Extensions.Configuration.Json": "1.0.1", + "Microsoft.Extensions.Caching.SqlServer": "1.0.2", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.2", + "Microsoft.Extensions.Configuration.Json": "1.0.2", "Microsoft.Extensions.DependencyInjection": "1.0.1", "xunit": "2.1.0" }, From 86b9ffd02a7c0c6c4685095a494b3d9f9ee2d087 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sun, 12 Feb 2017 16:59:38 -0800 Subject: [PATCH 2/4] Update to Microsoft.NETCore.App 1.0.4 and pin cli to 1.0.0-preview2-003154 --- global.json | 5 ++++- samples/MemoryCacheConcurencySample/project.json | 2 +- samples/MemoryCacheSample/project.json | 2 +- samples/ProfilingSample/project.json | 2 +- samples/SqlServerCacheConcurencySample/project.json | 2 +- samples/SqlServerCacheSample/project.json | 2 +- .../project.json | 2 +- test/Microsoft.Extensions.Caching.Memory.Tests/project.json | 2 +- .../project.json | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/global.json b/global.json index 983ba040..c3c3dd88 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { - "projects": ["src"] + "projects": ["src"], + "sdk": { + "version": "1.0.0-preview2-003154" + } } diff --git a/samples/MemoryCacheConcurencySample/project.json b/samples/MemoryCacheConcurencySample/project.json index fc452cee..f9731d0a 100644 --- a/samples/MemoryCacheConcurencySample/project.json +++ b/samples/MemoryCacheConcurencySample/project.json @@ -10,7 +10,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" } } diff --git a/samples/MemoryCacheSample/project.json b/samples/MemoryCacheSample/project.json index fc452cee..f9731d0a 100644 --- a/samples/MemoryCacheSample/project.json +++ b/samples/MemoryCacheSample/project.json @@ -10,7 +10,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" } } diff --git a/samples/ProfilingSample/project.json b/samples/ProfilingSample/project.json index fc452cee..f9731d0a 100644 --- a/samples/ProfilingSample/project.json +++ b/samples/ProfilingSample/project.json @@ -10,7 +10,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" } } diff --git a/samples/SqlServerCacheConcurencySample/project.json b/samples/SqlServerCacheConcurencySample/project.json index 939b5c02..b1b004e4 100644 --- a/samples/SqlServerCacheConcurencySample/project.json +++ b/samples/SqlServerCacheConcurencySample/project.json @@ -19,7 +19,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" } } diff --git a/samples/SqlServerCacheSample/project.json b/samples/SqlServerCacheSample/project.json index 5ee9910a..62fb0036 100644 --- a/samples/SqlServerCacheSample/project.json +++ b/samples/SqlServerCacheSample/project.json @@ -18,7 +18,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" } } diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json index 724b0c3d..4f31ac0b 100644 --- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json +++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json @@ -11,7 +11,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" } } diff --git a/test/Microsoft.Extensions.Caching.Memory.Tests/project.json b/test/Microsoft.Extensions.Caching.Memory.Tests/project.json index fce46e01..f2fe4a78 100644 --- a/test/Microsoft.Extensions.Caching.Memory.Tests/project.json +++ b/test/Microsoft.Extensions.Caching.Memory.Tests/project.json @@ -18,7 +18,7 @@ ], "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" }, "System.Diagnostics.Process": "4.1.0" diff --git a/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json b/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json index d6828f2b..01018ebe 100644 --- a/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json +++ b/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json @@ -25,7 +25,7 @@ ], "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.3", + "version": "1.0.4", "type": "platform" }, "moq.netcore": "4.4.0-beta8", From a39f4d9d091ae1bd64959417e2a055cfaad9636e Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 13 Feb 2017 12:35:58 -0800 Subject: [PATCH 3/4] Revert tool version updates --- .../project.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json index 4f31ac0b..14a7a797 100644 --- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json +++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json @@ -1,9 +1,9 @@ { - "version": "1.0.0-preview4-update1", + "version": "1.0.0-preview4-final", "dependencies": { "Microsoft.Extensions.CommandLineUtils": "1.0.1", - "Microsoft.Extensions.Logging": "1.0.2", - "Microsoft.Extensions.Logging.Console": "1.0.2", + "Microsoft.Extensions.Logging": "1.0.1", + "Microsoft.Extensions.Logging.Console": "1.0.1", "System.Data.SqlClient": "4.1.0" }, "description": "Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.", @@ -11,7 +11,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.4", + "version": "1.0.3", "type": "platform" } } From 0a71b224951473259da2b34ab39e3745295e27d8 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 13 Feb 2017 12:53:26 -0800 Subject: [PATCH 4/4] Update NuGet.config --- NuGet.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06aa92db..9345fbba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,7 @@ - + - \ No newline at end of file +