From 8c6ee1003c4e4fd96a25fe28231bd62f84bf7508 Mon Sep 17 00:00:00 2001 From: etomas Date: Wed, 1 Feb 2017 13:19:47 +0100 Subject: [PATCH] Update to netcore1.1 --- src/Services/Basket/Basket.API/Dockerfile | 2 +- src/Services/Basket/Basket.API/project.json | 31 +++++----- src/Services/Catalog/Catalog.API/Dockerfile | 2 +- src/Services/Catalog/Catalog.API/project.json | 40 ++++++------ src/Services/Identity/Identity.API/Dockerfile | 2 +- .../Identity/Identity.API/project.json | 62 +++++++++---------- 6 files changed, 68 insertions(+), 71 deletions(-) diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 90c726b0e..bd3bad87b 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:1.0.1 +FROM microsoft/aspnetcore:1.1 ENTRYPOINT ["dotnet", "Basket.API.dll"] ARG source=. WORKDIR /app diff --git a/src/Services/Basket/Basket.API/project.json b/src/Services/Basket/Basket.API/project.json index bff91d429..4ca72f510 100644 --- a/src/Services/Basket/Basket.API/project.json +++ b/src/Services/Basket/Basket.API/project.json @@ -1,20 +1,20 @@ { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.1.0", "type": "platform" }, - "System.Threading": "4.0.11", - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", + "System.Threading": "4.3.0", + "Microsoft.AspNetCore.Mvc": "1.1.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", + "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", + "Microsoft.Extensions.Configuration.Json": "1.1.0", + "Microsoft.Extensions.Logging": "1.1.0", + "Microsoft.Extensions.Logging.Console": "1.1.0", + "Microsoft.Extensions.Logging.Debug": "1.1.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", "StackExchange.Redis": "1.1.608", "Newtonsoft.Json": "9.0.1", "IdentityServer4.AccessTokenValidation": "1.0.1-rc3", @@ -24,10 +24,11 @@ "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ - "dotnet5.6", - "portable-net45+win8" + "netstandard1.6.1", + "dnxcore50", + "portable-net451+win8" ] } }, diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 8bbc926f9..b2148694a 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:1.0.1 +FROM microsoft/aspnetcore:1.1 WORKDIR /app EXPOSE 80 COPY . /app diff --git a/src/Services/Catalog/Catalog.API/project.json b/src/Services/Catalog/Catalog.API/project.json index 6705792b9..45a732033 100644 --- a/src/Services/Catalog/Catalog.API/project.json +++ b/src/Services/Catalog/Catalog.API/project.json @@ -1,33 +1,33 @@ { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.1", + "version": "1.1.0", "type": "platform" }, - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.EntityFrameworkCore": "1.0.1", - "Microsoft.EntityFrameworkCore.Relational": "1.0.1", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1", - "Microsoft.EntityFrameworkCore.Design": "1.0.0-preview2-final", + "Microsoft.AspNetCore.Mvc": "1.1.0", + "Microsoft.AspNetCore.Diagnostics": "1.1.0", + "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.1.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", + "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", + "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", + "Microsoft.Extensions.Configuration.Json": "1.1.0", + "Microsoft.Extensions.Logging": "1.1.0", + "Microsoft.Extensions.Logging.Console": "1.1.0", + "Microsoft.Extensions.Logging.Debug": "1.1.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", + "Microsoft.EntityFrameworkCore": "1.1.0", + "Microsoft.EntityFrameworkCore.Relational": "1.1.0", + "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", + "Microsoft.EntityFrameworkCore.Design": "1.1.0", "Swashbuckle": "6.0.0-beta902" }, "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final" + "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "dotnet5.6", "portable-net45+win8" diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index 38dda0129..5eb4acdb6 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:1.0.1 +FROM microsoft/aspnetcore:1.1 ENTRYPOINT ["dotnet", "Identity.API.dll"] ARG source=. WORKDIR /app diff --git a/src/Services/Identity/Identity.API/project.json b/src/Services/Identity/Identity.API/project.json index a63963893..fa9795162 100644 --- a/src/Services/Identity/Identity.API/project.json +++ b/src/Services/Identity/Identity.API/project.json @@ -3,59 +3,55 @@ "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.1", + "version": "1.1.0", "type": "platform" }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Routing": "1.0.1", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1", + "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", + "Microsoft.AspNetCore.Diagnostics": "1.1.0", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", + "Microsoft.AspNetCore.Mvc": "1.1.0", + "Microsoft.AspNetCore.Routing": "1.1.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", + "Microsoft.AspNetCore.StaticFiles": "1.1.0", + "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", "Microsoft.EntityFrameworkCore.SqlServer.Design": { - "version": "1.0.1", + "version": "1.1.0", "type": "build" }, "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.0.0-preview2-final", + "version": "1.1.0-preview4-final", "type": "build" }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", + "Microsoft.Extensions.Configuration.Json": "1.1.0", + "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", + "Microsoft.Extensions.Logging": "1.1.0", + "Microsoft.Extensions.Logging.Console": "1.1.0", + "Microsoft.Extensions.Logging.Debug": "1.1.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", + "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0", "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", + "version": "1.1.0-preview4-final", "type": "build" }, "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview2-final", + "version": "1.1.0-preview4-final", "type": "build" }, "IdentityServer4.AspNetIdentity": "1.0.0-rc3", - "IdentityServer4.EntityFramework": "1.0.0-rc3" + "IdentityServer4.EntityFramework": "1.0.0-rc3", }, "tools": { "BundlerMinifier.Core": "2.0.238", - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final", - "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview2-final", + "Microsoft.AspNetCore.Razor.Tools": "1.1.0-preview4-final", + "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final", + "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final", + "Microsoft.Extensions.SecretManager.Tools": "1.1.0-preview4-final", "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", + "version": "1.1.0-preview4-final", "imports": [ "portable-net45+win8" ]