From 3fb24238169ff4bcad6719eabbf7b9cea4411d4c Mon Sep 17 00:00:00 2001 From: f7Q Date: Fri, 15 Sep 2017 06:24:09 +0900 Subject: [PATCH 01/14] console program --- console/global.json | 2 +- console/src/src.csproj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/console/global.json b/console/global.json index 0fb4d16..d76e72f 100644 --- a/console/global.json +++ b/console/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/console/src/src.csproj b/console/src/src.csproj index 7044933..698b553 100644 --- a/console/src/src.csproj +++ b/console/src/src.csproj @@ -1,13 +1,13 @@  - netcoreapp1.0 + netcoreapp1.1 portable src Exe src - $(PackageTargetFallback);dnxcore50 - 1.0.4 + $(PackageTargetFallback) + 1.1.2 @@ -15,8 +15,8 @@ win10-x64 - - + + From fc13c2cde6ba158d329e416b9099fe2aa5974e86 Mon Sep 17 00:00:00 2001 From: f7Q Date: Fri, 15 Sep 2017 07:03:03 +0900 Subject: [PATCH 02/14] Update Dapper Sample --- DapperSample/global.json | 2 +- .../src/DapperSample/DapperSample.csproj | 51 ++++++++++--------- DapperSample/src/DapperSample/Startup.cs | 43 +++++++++++----- 3 files changed, 56 insertions(+), 40 deletions(-) diff --git a/DapperSample/global.json b/DapperSample/global.json index 0fb4d16..d76e72f 100644 --- a/DapperSample/global.json +++ b/DapperSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/DapperSample/src/DapperSample/DapperSample.csproj b/DapperSample/src/DapperSample/DapperSample.csproj index 3c9ead3..6cf11ec 100644 --- a/DapperSample/src/DapperSample/DapperSample.csproj +++ b/DapperSample/src/DapperSample/DapperSample.csproj @@ -1,45 +1,46 @@  - netcoreapp1.0 + netcoreapp1.1 true DapperSample Exe DapperSample - 1.0.4 + 1.1.2 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + All - + + - + diff --git a/DapperSample/src/DapperSample/Startup.cs b/DapperSample/src/DapperSample/Startup.cs index 87734df..9f100a9 100644 --- a/DapperSample/src/DapperSample/Startup.cs +++ b/DapperSample/src/DapperSample/Startup.cs @@ -1,13 +1,18 @@ using System; +using System.IO; using System.Collections.Generic; using System.Linq; +using System.Runtime.InteropServices; using System.Threading.Tasks; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Swashbuckle.Swagger.Model; +using Swashbuckle.AspNetCore.Swagger; +using Swashbuckle.AspNetCore.SwaggerGen; +using Swashbuckle.AspNetCore.SwaggerUI; using WebApiSample.Models; using Microsoft.EntityFrameworkCore; @@ -68,18 +73,22 @@ public void ConfigureServices(IServiceCollection services) } // Add framework services. services.AddMvc(); - services.AddSwaggerGen(); - services.ConfigureSwaggerGen(options => + services.AddSwaggerGen(c => { - options.SingleApiVersion(new Info - { - Version = "v1", - Title = "Geo Search API", - Description = "A simple api to search using geo location in Elasticsearch", - TermsOfService = "None" - }); - //options.IncludeXmlComments(pathToDoc); - options.DescribeAllEnumsAsStrings(); + c.SwaggerDoc("v1", + new Info + { + Version = "v1", + Title = "Geo Search API", + Description = "A simple api to search using geo location in Elasticsearch", + TermsOfService = "None" + } + ); + + //var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "MyApi.xml"); + //c.IncludeXmlComments(filePath); + //c.IncludeXmlComments(pathToDoc); + c.DescribeAllEnumsAsStrings(); }); } @@ -91,8 +100,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseMvc(); - app.UseSwagger(); - app.UseSwaggerUi(); + app.UseSwagger(c => + { + c.RouteTemplate = "api-docs/{documentName}/swagger.json"; + }); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/api-docs/v1/swagger.json", "My API V1"); + }); } } } From dcf1d077408a3bbef5d7bb93c479bc70ab9ad19e Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 16 Sep 2017 16:58:14 +0900 Subject: [PATCH 03/14] ef project update --- ef/global.json | 2 +- ef/src/src.csproj | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ef/global.json b/ef/global.json index 7213957..d76e72f 100644 --- a/ef/global.json +++ b/ef/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.4" + "version": "1.1.0" } } \ No newline at end of file diff --git a/ef/src/src.csproj b/ef/src/src.csproj index c855fa9..ee1b30a 100644 --- a/ef/src/src.csproj +++ b/ef/src/src.csproj @@ -1,46 +1,46 @@  - netcoreapp1.0 + netcoreapp1.1 portable src Exe src - $(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - 1.0.4 + 1.1.2 - + All - - - - + + + + All - + All - + All - + All - - - - - - - + + + + + + + - + From aac612e189b69b11cac703e2e4c3b214113af27e Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 16 Sep 2017 17:33:11 +0900 Subject: [PATCH 04/14] update GroongaSample --- GroongaSample/global.json | 2 +- GroongaSample/src/WebApiSample/Startup.cs | 40 ++++++++++------ .../src/WebApiSample/WebApiSample.csproj | 48 +++++++++---------- 3 files changed, 51 insertions(+), 39 deletions(-) diff --git a/GroongaSample/global.json b/GroongaSample/global.json index 0fb4d16..d76e72f 100644 --- a/GroongaSample/global.json +++ b/GroongaSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/GroongaSample/src/WebApiSample/Startup.cs b/GroongaSample/src/WebApiSample/Startup.cs index 31f888c..584099c 100644 --- a/GroongaSample/src/WebApiSample/Startup.cs +++ b/GroongaSample/src/WebApiSample/Startup.cs @@ -7,7 +7,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Swashbuckle.Swagger.Model; +using Swashbuckle.AspNetCore.Swagger; +using Swashbuckle.AspNetCore.SwaggerGen; +using Swashbuckle.AspNetCore.SwaggerUI; using WebApiSample.Models; using Microsoft.EntityFrameworkCore; @@ -87,18 +89,22 @@ public void ConfigureServices(IServiceCollection services) } // Add framework services. services.AddMvc(); - services.AddSwaggerGen(); - services.ConfigureSwaggerGen(options => + services.AddSwaggerGen(c => { - options.SingleApiVersion(new Info - { - Version = "v1", - Title = "Geo Search API", - Description = "A simple api to search using geo location in Elasticsearch", - TermsOfService = "None" - }); - //options.IncludeXmlComments(pathToDoc); - options.DescribeAllEnumsAsStrings(); + c.SwaggerDoc("v1", + new Info + { + Version = "v1", + Title = "Geo Search API", + Description = "A simple api to search using geo location in Elasticsearch", + TermsOfService = "None" + } + ); + + //var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "MyApi.xml"); + //c.IncludeXmlComments(filePath); + //c.IncludeXmlComments(pathToDoc); + c.DescribeAllEnumsAsStrings(); }); } @@ -110,8 +116,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseMvc(); - app.UseSwagger(); - app.UseSwaggerUi(); + app.UseSwagger(c => + { + c.RouteTemplate = "api-docs/{documentName}/swagger.json"; + }); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/api-docs/v1/swagger.json", "My API V1"); + }); } } } diff --git a/GroongaSample/src/WebApiSample/WebApiSample.csproj b/GroongaSample/src/WebApiSample/WebApiSample.csproj index 766c38f..eaa3cc4 100644 --- a/GroongaSample/src/WebApiSample/WebApiSample.csproj +++ b/GroongaSample/src/WebApiSample/WebApiSample.csproj @@ -1,45 +1,45 @@ - netcoreapp1.0 + netcoreapp1.1 true WebApiSample Exe WebApiSample - 1.0.4 + 1.1.2 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + All - - - - - - + + + + + + All - + From 6fe523852d84905923211e2b94b135c708c153a7 Mon Sep 17 00:00:00 2001 From: f7Q Date: Sun, 17 Sep 2017 19:29:25 +0900 Subject: [PATCH 05/14] update scaffold, PotableLib --- PortableLib/global.json | 2 +- PortableLib/src/Sample/Sample.csproj | 2 +- scaffold/global.json | 2 +- scaffold/scaffold.sln | 36 ++++++++++++++++++++++++++++ scaffold/src/src.csproj | 12 +++++----- 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 scaffold/scaffold.sln diff --git a/PortableLib/global.json b/PortableLib/global.json index 0fb4d16..d76e72f 100644 --- a/PortableLib/global.json +++ b/PortableLib/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/PortableLib/src/Sample/Sample.csproj b/PortableLib/src/Sample/Sample.csproj index 655f880..a53f498 100644 --- a/PortableLib/src/Sample/Sample.csproj +++ b/PortableLib/src/Sample/Sample.csproj @@ -7,7 +7,7 @@ Sample Sample $(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+net461+win8 - 1.6.0 + 1.6.1 diff --git a/scaffold/global.json b/scaffold/global.json index 0fb4d16..d76e72f 100644 --- a/scaffold/global.json +++ b/scaffold/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/scaffold/scaffold.sln b/scaffold/scaffold.sln new file mode 100644 index 0000000..274d7b5 --- /dev/null +++ b/scaffold/scaffold.sln @@ -0,0 +1,36 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.15 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "src", "src\src.csproj", "{3238DE11-6670-444B-BA5F-DB5226A11137}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3238DE11-6670-444B-BA5F-DB5226A11137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Debug|x64.ActiveCfg = Debug|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Debug|x64.Build.0 = Debug|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Debug|x86.ActiveCfg = Debug|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Debug|x86.Build.0 = Debug|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Release|Any CPU.Build.0 = Release|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Release|x64.ActiveCfg = Release|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Release|x64.Build.0 = Release|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Release|x86.ActiveCfg = Release|Any CPU + {3238DE11-6670-444B-BA5F-DB5226A11137}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F74F91D2-1905-49DE-AD01-E76768E4363B} + EndGlobalSection +EndGlobal diff --git a/scaffold/src/src.csproj b/scaffold/src/src.csproj index 5f99da1..2638cc6 100644 --- a/scaffold/src/src.csproj +++ b/scaffold/src/src.csproj @@ -1,29 +1,29 @@  - netcoreapp1.0 + netcoreapp1.1 portable true src Exe src true - 1.0.4 + 1.1.2 $(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8 - - + + All - + All - + From f737880bc33548310380e8f88b84d1de05657453 Mon Sep 17 00:00:00 2001 From: f7Q Date: Thu, 28 Sep 2017 23:38:10 +0900 Subject: [PATCH 06/14] update WebApiFileUploadSample --- WebApiFileUploadSample/global.json | 2 +- .../Controllers/FilesController.cs | 1 + .../FileUploadOperation.cs | 4 +- .../Properties/launchSettings.json | 2 +- .../src/WebApiFileUploadSample/Startup.cs | 45 ++++++++++++------- .../WebApiFileUploadSample.csproj | 2 +- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/WebApiFileUploadSample/global.json b/WebApiFileUploadSample/global.json index 0fb4d16..d76e72f 100644 --- a/WebApiFileUploadSample/global.json +++ b/WebApiFileUploadSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/WebApiFileUploadSample/src/WebApiFileUploadSample/Controllers/FilesController.cs b/WebApiFileUploadSample/src/WebApiFileUploadSample/Controllers/FilesController.cs index d80186f..9db8666 100644 --- a/WebApiFileUploadSample/src/WebApiFileUploadSample/Controllers/FilesController.cs +++ b/WebApiFileUploadSample/src/WebApiFileUploadSample/Controllers/FilesController.cs @@ -42,6 +42,7 @@ public IActionResult Get(string name) { try { + // issue ? don't download var val = _dbContext.Values.FirstOrDefault(d => d.Name == name); return File(val.Image, "image/png"); } diff --git a/WebApiFileUploadSample/src/WebApiFileUploadSample/FileUploadOperation.cs b/WebApiFileUploadSample/src/WebApiFileUploadSample/FileUploadOperation.cs index 41d029d..688e623 100644 --- a/WebApiFileUploadSample/src/WebApiFileUploadSample/FileUploadOperation.cs +++ b/WebApiFileUploadSample/src/WebApiFileUploadSample/FileUploadOperation.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Swashbuckle.Swagger.Model; -using Swashbuckle.SwaggerGen.Generator; +using Swashbuckle.AspNetCore.Swagger; +using Swashbuckle.AspNetCore.SwaggerGen; namespace WebApiFileUploadSample diff --git a/WebApiFileUploadSample/src/WebApiFileUploadSample/Properties/launchSettings.json b/WebApiFileUploadSample/src/WebApiFileUploadSample/Properties/launchSettings.json index 412a1b2..a87daf8 100644 --- a/WebApiFileUploadSample/src/WebApiFileUploadSample/Properties/launchSettings.json +++ b/WebApiFileUploadSample/src/WebApiFileUploadSample/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:64244/swagger/ui/index.html", + "applicationUrl": "http://localhost:64244/swagger/index.html", "sslPort": 0 } }, diff --git a/WebApiFileUploadSample/src/WebApiFileUploadSample/Startup.cs b/WebApiFileUploadSample/src/WebApiFileUploadSample/Startup.cs index c25e173..f851fc5 100644 --- a/WebApiFileUploadSample/src/WebApiFileUploadSample/Startup.cs +++ b/WebApiFileUploadSample/src/WebApiFileUploadSample/Startup.cs @@ -7,7 +7,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Swashbuckle.Swagger.Model; +using Swashbuckle.AspNetCore.Swagger; +using Swashbuckle.AspNetCore.SwaggerGen; +using Swashbuckle.AspNetCore.SwaggerUI; using WebApiFileUploadSample.Models; using Microsoft.EntityFrameworkCore; @@ -43,21 +45,25 @@ public void ConfigureServices(IServiceCollection services) }); } //var pathToDoc = this.configurationRoot["Swagger:Path"]; - services.AddSwaggerGen(); - services.ConfigureSwaggerGen(options => + services.AddSwaggerGen(c => { - options.SingleApiVersion(new Info - { - Version = "v1", - Title = "File Store API", - Description = "A simple api to File Access", - TermsOfService = "None" - }); - //options.IncludeXmlComments(pathToDoc); - options.DescribeAllEnumsAsStrings(); - options.CustomSchemaIds(otions => options.GetType().FullName); + c.SwaggerDoc("v1", + new Info + { + Version = "v1", + Title = "Geo Search API", + Description = "A simple api to search using geo location in Elasticsearch", + TermsOfService = "None" + } + ); - options.OperationFilter(); //Register File Upload Operation Filter + //var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "MyApi.xml"); + //c.IncludeXmlComments(filePath); + //c.IncludeXmlComments(pathToDoc); + c.DescribeAllEnumsAsStrings(); + c.DescribeAllEnumsAsStrings(); + c.CustomSchemaIds((type) => type.FullName); + c.OperationFilter(); //Register File Upload Operation Filter }); } @@ -68,8 +74,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF loggerFactory.AddDebug(); app.UseMvc(); - app.UseSwagger(); - app.UseSwaggerUi(); + app.UseSwagger(c => + { + c.RouteTemplate = "api-docs/{documentName}/swagger.json"; + }); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/api-docs/v1/swagger.json", "My API V1"); + c.DocExpansion("none"); + }); } } } diff --git a/WebApiFileUploadSample/src/WebApiFileUploadSample/WebApiFileUploadSample.csproj b/WebApiFileUploadSample/src/WebApiFileUploadSample/WebApiFileUploadSample.csproj index 6bd10ef..011949f 100644 --- a/WebApiFileUploadSample/src/WebApiFileUploadSample/WebApiFileUploadSample.csproj +++ b/WebApiFileUploadSample/src/WebApiFileUploadSample/WebApiFileUploadSample.csproj @@ -17,7 +17,7 @@ - + From 66a7a48f7899061725f6b3c727097d5ad665e77e Mon Sep 17 00:00:00 2001 From: f7Q Date: Thu, 28 Sep 2017 23:45:14 +0900 Subject: [PATCH 07/14] update cakebuild --- cakebuild/build.cake | 2 +- cakebuild/cakebuild.sln | 58 +++++++++++++++++++ cakebuild/global.json | 2 +- cakebuild/src/Sample/Sample.csproj | 4 +- .../test/Sample.Tests/Sample.Tests.csproj | 4 +- 5 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 cakebuild/cakebuild.sln diff --git a/cakebuild/build.cake b/cakebuild/build.cake index 14b45b2..fa87363 100644 --- a/cakebuild/build.cake +++ b/cakebuild/build.cake @@ -9,7 +9,7 @@ var buildArtifacts = Directory("./artifacts/packages"); var isAppVeyor = AppVeyor.IsRunningOnAppVeyor; var isWindows = IsRunningOnWindows(); -var netcore = "netcoreapp1.0"; +var netcore = "netcoreapp1.1"; var netstandard = "netstandard1.6"; /////////////////////////////////////////////////////////////////////////////// diff --git a/cakebuild/cakebuild.sln b/cakebuild/cakebuild.sln new file mode 100644 index 0000000..7066c75 --- /dev/null +++ b/cakebuild/cakebuild.sln @@ -0,0 +1,58 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.16 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F6291AB0-25CE-4921-BA8B-CF1A11C404C9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "src\Sample\Sample.csproj", "{499BA3F9-5782-46D1-BCD0-C9952F2A8628}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{85E490BF-FD8B-4590-97F1-C28E9E7C951A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Tests", "test\Sample.Tests\Sample.Tests.csproj", "{61C659C3-3690-4831-AC20-24BD824D8199}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Debug|Any CPU.Build.0 = Debug|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Debug|x64.ActiveCfg = Debug|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Debug|x64.Build.0 = Debug|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Debug|x86.ActiveCfg = Debug|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Debug|x86.Build.0 = Debug|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Release|Any CPU.ActiveCfg = Release|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Release|Any CPU.Build.0 = Release|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Release|x64.ActiveCfg = Release|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Release|x64.Build.0 = Release|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Release|x86.ActiveCfg = Release|Any CPU + {499BA3F9-5782-46D1-BCD0-C9952F2A8628}.Release|x86.Build.0 = Release|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Debug|x64.ActiveCfg = Debug|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Debug|x64.Build.0 = Debug|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Debug|x86.ActiveCfg = Debug|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Debug|x86.Build.0 = Debug|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Release|Any CPU.Build.0 = Release|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Release|x64.ActiveCfg = Release|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Release|x64.Build.0 = Release|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Release|x86.ActiveCfg = Release|Any CPU + {61C659C3-3690-4831-AC20-24BD824D8199}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {499BA3F9-5782-46D1-BCD0-C9952F2A8628} = {F6291AB0-25CE-4921-BA8B-CF1A11C404C9} + {61C659C3-3690-4831-AC20-24BD824D8199} = {85E490BF-FD8B-4590-97F1-C28E9E7C951A} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {79D710AD-6C4E-405B-A7C1-12B3AA9F8B8D} + EndGlobalSection +EndGlobal diff --git a/cakebuild/global.json b/cakebuild/global.json index 4234bd8..194114a 100644 --- a/cakebuild/global.json +++ b/cakebuild/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/cakebuild/src/Sample/Sample.csproj b/cakebuild/src/Sample/Sample.csproj index 01568c0..7ca0712 100644 --- a/cakebuild/src/Sample/Sample.csproj +++ b/cakebuild/src/Sample/Sample.csproj @@ -1,12 +1,12 @@  - netcoreapp1.0 + netcoreapp1.1 portable true Sample Sample - 1.0.4 + 1.1.2 $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/cakebuild/test/Sample.Tests/Sample.Tests.csproj b/cakebuild/test/Sample.Tests/Sample.Tests.csproj index 168d99a..36e9ee3 100644 --- a/cakebuild/test/Sample.Tests/Sample.Tests.csproj +++ b/cakebuild/test/Sample.Tests/Sample.Tests.csproj @@ -1,13 +1,13 @@ - netcoreapp1.0 + netcoreapp1.1 portable Sample.Tests Sample.Tests true $(PackageTargetFallback);dotnet5.4;portable-net451+win8 - 1.0.4 + 1.1.2 From 19b50a8b2c1f2839e70d072fe9d09b8b4d2c84f1 Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 30 Sep 2017 02:38:41 +0900 Subject: [PATCH 08/14] Update WefBappRebootSample but don't exit(0) --- WebApiRebootSample/global.json | 2 +- .../src/WebApiRebootSample/Controllers/ValuesController.cs | 7 ++++--- .../src/WebApiRebootSample/Properties/launchSettings.json | 2 +- .../src/WebApiRebootSample/WebApiRebootSample.csproj | 4 ---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/WebApiRebootSample/global.json b/WebApiRebootSample/global.json index 0fb4d16..d76e72f 100644 --- a/WebApiRebootSample/global.json +++ b/WebApiRebootSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/WebApiRebootSample/src/WebApiRebootSample/Controllers/ValuesController.cs b/WebApiRebootSample/src/WebApiRebootSample/Controllers/ValuesController.cs index b99dca0..16d7e5a 100644 --- a/WebApiRebootSample/src/WebApiRebootSample/Controllers/ValuesController.cs +++ b/WebApiRebootSample/src/WebApiRebootSample/Controllers/ValuesController.cs @@ -22,13 +22,13 @@ public IEnumerable Get() { return new string[] { "value1", "value2" }; } - // GET api/safeRestart + // GET api/values/safeRestart [HttpGet] [Route("safeRestart")] public void GetSafeRestart() { var process = Process.GetCurrentProcess(); - /*var processId = process.Id; + var processId = process.Id; using (var newprocess = new Process()) { var startinfo = process.StartInfo; @@ -42,10 +42,11 @@ public void GetSafeRestart() //Program.Main(); if (process.HasExited) { + Console.WriteLine(@"restart {0}", process.ExitCode); newprocess.Start(); Console.WriteLine(@"restart {0}", process.ExitCode); } - }*/ + } //this._life.StopApplication(); //this._life.ApplicationStarted; diff --git a/WebApiRebootSample/src/WebApiRebootSample/Properties/launchSettings.json b/WebApiRebootSample/src/WebApiRebootSample/Properties/launchSettings.json index e13b136..34676ea 100644 --- a/WebApiRebootSample/src/WebApiRebootSample/Properties/launchSettings.json +++ b/WebApiRebootSample/src/WebApiRebootSample/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:65177/", + "applicationUrl": "http://localhost:65177/api/Values/safeRestart", "sslPort": 0 } }, diff --git a/WebApiRebootSample/src/WebApiRebootSample/WebApiRebootSample.csproj b/WebApiRebootSample/src/WebApiRebootSample/WebApiRebootSample.csproj index 396ee59..f550d8c 100644 --- a/WebApiRebootSample/src/WebApiRebootSample/WebApiRebootSample.csproj +++ b/WebApiRebootSample/src/WebApiRebootSample/WebApiRebootSample.csproj @@ -4,10 +4,6 @@ netcoreapp1.1 - - - - From 666cb2d4e34c1273fab6d85f744ec60889e12e8a Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 30 Sep 2017 02:50:00 +0900 Subject: [PATCH 09/14] Update WebApiSample --- WebApiSample/global.json | 2 +- WebApiSample/src/WebApiSample/Startup.cs | 40 ++++++++++------ .../src/WebApiSample/WebApiSample.csproj | 46 +++++++++---------- 3 files changed, 50 insertions(+), 38 deletions(-) diff --git a/WebApiSample/global.json b/WebApiSample/global.json index 0fb4d16..d76e72f 100644 --- a/WebApiSample/global.json +++ b/WebApiSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/WebApiSample/src/WebApiSample/Startup.cs b/WebApiSample/src/WebApiSample/Startup.cs index d9e906b..8a5dd2c 100644 --- a/WebApiSample/src/WebApiSample/Startup.cs +++ b/WebApiSample/src/WebApiSample/Startup.cs @@ -7,7 +7,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Swashbuckle.Swagger.Model; +using Swashbuckle.AspNetCore.Swagger; +using Swashbuckle.AspNetCore.SwaggerGen; +using Swashbuckle.AspNetCore.SwaggerUI; using WebApiSample.Models; using Microsoft.EntityFrameworkCore; @@ -68,18 +70,22 @@ public void ConfigureServices(IServiceCollection services) } // Add framework services. services.AddMvc(); - services.AddSwaggerGen(); - services.ConfigureSwaggerGen(options => + services.AddSwaggerGen(c => { - options.SingleApiVersion(new Info - { - Version = "v1", - Title = "Geo Search API", - Description = "A simple api to search using geo location in Elasticsearch", - TermsOfService = "None" - }); - //options.IncludeXmlComments(pathToDoc); - options.DescribeAllEnumsAsStrings(); + c.SwaggerDoc("v1", + new Info + { + Version = "v1", + Title = "Geo Search API", + Description = "A simple api to search using geo location in Elasticsearch", + TermsOfService = "None" + } + ); + + //var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "MyApi.xml"); + //c.IncludeXmlComments(filePath); + //c.IncludeXmlComments(pathToDoc); + c.DescribeAllEnumsAsStrings(); }); } @@ -91,8 +97,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseMvc(); - app.UseSwagger(); - app.UseSwaggerUi(); + app.UseSwagger(c => + { + c.RouteTemplate = "api-docs/{documentName}/swagger.json"; + }); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/api-docs/v1/swagger.json", "My API V1"); + }); } } } diff --git a/WebApiSample/src/WebApiSample/WebApiSample.csproj b/WebApiSample/src/WebApiSample/WebApiSample.csproj index 9c956d8..f7c1908 100644 --- a/WebApiSample/src/WebApiSample/WebApiSample.csproj +++ b/WebApiSample/src/WebApiSample/WebApiSample.csproj @@ -1,44 +1,44 @@ - netcoreapp1.0 + netcoreapp1.1 true WebApiSample Exe WebApiSample - 1.0.4 + 1.1.2 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + All - + - + From 5af379a80a668bbe6560764ed6ca7121334fe8e6 Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 30 Sep 2017 23:21:54 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BB=AE=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/WebApiSample/WebApiSample.csproj | 4 +- WebApiScaffoldSample/global.json | 2 +- .../src/WebApiScaffoldSample/Startup.cs | 40 +++++++---- .../WebApiScaffoldSample.csproj | 68 +++++++++++-------- 4 files changed, 69 insertions(+), 45 deletions(-) diff --git a/WebApiSample/src/WebApiSample/WebApiSample.csproj b/WebApiSample/src/WebApiSample/WebApiSample.csproj index f7c1908..e3e7ee4 100644 --- a/WebApiSample/src/WebApiSample/WebApiSample.csproj +++ b/WebApiSample/src/WebApiSample/WebApiSample.csproj @@ -28,8 +28,8 @@ - - + + All diff --git a/WebApiScaffoldSample/global.json b/WebApiScaffoldSample/global.json index 0fb4d16..d76e72f 100644 --- a/WebApiScaffoldSample/global.json +++ b/WebApiScaffoldSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/WebApiScaffoldSample/src/WebApiScaffoldSample/Startup.cs b/WebApiScaffoldSample/src/WebApiScaffoldSample/Startup.cs index 816aa32..0fe6cab 100644 --- a/WebApiScaffoldSample/src/WebApiScaffoldSample/Startup.cs +++ b/WebApiScaffoldSample/src/WebApiScaffoldSample/Startup.cs @@ -7,7 +7,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Swashbuckle.Swagger.Model; +using Swashbuckle.AspNetCore.Swagger; +using Swashbuckle.AspNetCore.SwaggerGen; +using Swashbuckle.AspNetCore.SwaggerUI; using WebApiSample.Models; using Microsoft.EntityFrameworkCore; @@ -68,18 +70,22 @@ public void ConfigureServices(IServiceCollection services) } // Add framework services. services.AddMvc(); - services.AddSwaggerGen(); - services.ConfigureSwaggerGen(options => + services.AddSwaggerGen(c => { - options.SingleApiVersion(new Info - { - Version = "v1", - Title = "Geo Search API", - Description = "A simple api to search using geo location in Elasticsearch", - TermsOfService = "None" - }); - //options.IncludeXmlComments(pathToDoc); - options.DescribeAllEnumsAsStrings(); + c.SwaggerDoc("v1", + new Info + { + Version = "v1", + Title = "Geo Search API", + Description = "A simple api to search using geo location in Elasticsearch", + TermsOfService = "None" + } + ); + + //var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "MyApi.xml"); + //c.IncludeXmlComments(filePath); + //c.IncludeXmlComments(pathToDoc); + c.DescribeAllEnumsAsStrings(); }); } @@ -91,8 +97,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseMvc(); - app.UseSwagger(); - app.UseSwaggerUi(); + app.UseSwagger(c => + { + c.RouteTemplate = "api-docs/{documentName}/swagger.json"; + }); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/api-docs/v1/swagger.json", "My API V1"); + }); } } } diff --git a/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj b/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj index f24409a..b8d0740 100644 --- a/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj +++ b/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj @@ -1,48 +1,60 @@  - netcoreapp1.0 + netcoreapp1.1 true WebApiScaffoldSample Exe WebApiScaffoldSample - 1.0.4 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + 1.1.2 + $(PackageTargetFallback); - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + All - - + + + + + + - - + + From 1244151a9af2f418ff846a89c7f98656e2c2eea7 Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 30 Sep 2017 23:44:11 +0900 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BB=AE=E7=99=BB=E9=8C=B2=EF=BC=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebApiScaffoldSample.csproj | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj b/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj index b8d0740..7d171af 100644 --- a/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj +++ b/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj @@ -7,9 +7,13 @@ Exe WebApiScaffoldSample 1.1.2 - $(PackageTargetFallback); + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + + + + @@ -36,24 +40,29 @@ - - + --> + + All + + - + + --> From 8f0211048349d811292f5597b91f406b76bf5e92 Mon Sep 17 00:00:00 2001 From: f7Q Date: Sat, 30 Sep 2017 23:49:31 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BB=AE=E7=99=BB=E9=8C=B2=EF=BC=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebApiScaffoldSample.csproj | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj b/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj index 7d171af..e6f92de 100644 --- a/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj +++ b/WebApiScaffoldSample/src/WebApiScaffoldSample/WebApiScaffoldSample.csproj @@ -41,9 +41,6 @@ @@ -54,14 +51,20 @@ - + All - From fc916140bb33a370c62d58dcf602ac530ab0528f Mon Sep 17 00:00:00 2001 From: f7Q Date: Sun, 1 Oct 2017 00:14:48 +0900 Subject: [PATCH 13/14] Update WebAppScaffoldSample --- WebAppScaffoldSample/global.json | 2 +- .../src/WebApplication/WebApplication.csproj | 50 ++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/WebAppScaffoldSample/global.json b/WebAppScaffoldSample/global.json index 0fb4d16..d76e72f 100644 --- a/WebAppScaffoldSample/global.json +++ b/WebAppScaffoldSample/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0" + "version": "1.1.0" } } \ No newline at end of file diff --git a/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj b/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj index 7c200a0..3af9efe 100644 --- a/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj +++ b/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj @@ -1,13 +1,13 @@  - netcoreapp1.0 + netcoreapp1.1 true WebApplication Exe WebApplication - 1.0.4 - $(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8 + 1.1.2 + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; @@ -18,45 +18,49 @@ - - - - - - - - - - - + + + + + + + + + + + - - + + All + + All - - + + All - - + + - - + + + All + From 34f34fb42efbd10e0ce7c0ec0227fbca52c0dac1 Mon Sep 17 00:00:00 2001 From: f7Q Date: Sun, 1 Oct 2017 00:28:02 +0900 Subject: [PATCH 14/14] check mvc schaffold --- .../src/WebApplication/WebApplication.csproj | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj b/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj index 3af9efe..1a6dcda 100644 --- a/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj +++ b/WebAppScaffoldSample/src/WebApplication/WebApplication.csproj @@ -17,12 +17,15 @@ - + + + + @@ -63,4 +66,9 @@ + + + + +