Merge f8d45ee1d4 into 3af7133157

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -6,7 +6,10 @@
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
-
+  <PropertyGroup>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);1591</NoWarn>
+	</PropertyGroup>
   <ItemGroup>
     <Content Update="web.config">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

src/Services/Basket/Basket.API/GlobalUsings.cs

@@ -58,4 +58,5 @@ global using System.Net;
 global using System.Security.Claims;
 global using System.Text.Json;
 global using System.Threading.Tasks;
-global using System;
+global using System;
+global using System.Reflection;

src/Services/Basket/Basket.API/Startup.cs

@@ -29,11 +29,26 @@ public class Startup
 
         services.AddSwaggerGen(options =>
         {            
+            var basePath = AppDomain.CurrentDomain.BaseDirectory;
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var xmlComments = Path.Combine(basePath, fileName);
+            options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo
             {
                 Title = "eShopOnContainers - Basket HTTP API",
                 Version = "v1",
-                Description = "The Basket Service HTTP API"
+                Description = "The Basket Service HTTP API",
+                TermsOfService = new Uri("https://microsoft.com/"),
+                Contact = new OpenApiContact
+                {
+                    Name = "Microsoft Contact",
+                    Url = new Uri("https://microsoft.com/")
+                },
+                License = new OpenApiLicense
+                {
+                    Name = "Microsoft License",
+                    Url = new Uri("https://microsoft.com/")
+                }
             });
 
             options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -11,7 +11,10 @@
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
-
+	<PropertyGroup>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);1591</NoWarn>
+	</PropertyGroup>
 
   <ItemGroup>
     <Content Update="appsettings.json">

src/Services/Catalog/Catalog.API/Startup.cs

@@ -222,16 +222,29 @@ public static class CustomExtensionMethods
     {
         services.AddSwaggerGen(options =>
         {            
+            var basePath = AppDomain.CurrentDomain.BaseDirectory;
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var xmlComments = Path.Combine(basePath, fileName);
+            options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo
             {
                 Title = "eShopOnContainers - Catalog HTTP API",
                 Version = "v1",
-                Description = "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample"
+                Description = "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample",
+                TermsOfService = new Uri("https://microsoft.com/terms"),
+                Contact = new OpenApiContact
+                {
+                    Name = "Microsoft Contact",
+                    Url = new Uri("https://microsoft.com/contact")
+                },
+                License = new OpenApiLicense
+                {
+                    Name = "Microsoft License",
+                    Url = new Uri("https://microsoft.com/license")
+                }
             });
         });
-
         return services;
-
     }
 
     public static IServiceCollection AddIntegrationServices(this IServiceCollection services, IConfiguration configuration)

src/Services/Identity/Identity.API/GlobalUsings.cs

@@ -58,7 +58,9 @@ global using System.Security.Cryptography.X509Certificates;
 global using System.Text.RegularExpressions;
 global using System.Threading.Tasks;
 global using System;
-
+global using System.Reflection;
+global using Microsoft.OpenApi.Models;
+global using System.IO;
 
 
 

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -8,6 +8,11 @@
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
 
+	<PropertyGroup>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);1591</NoWarn>
+	</PropertyGroup>
+  
   <ItemGroup>
     <Content Include="Setup\**\*;">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

src/Services/Identity/Identity.API/Startup.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.DataProtection;
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API
 {
@@ -89,6 +89,30 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
             services.AddControllersWithViews();
             services.AddRazorPages();
 
+            services.AddSwaggerGen(options =>
+            {          
+                var basePath = AppDomain.CurrentDomain.BaseDirectory;
+                var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
+                var xmlComments = Path.Combine(basePath, fileName);
+                options.IncludeXmlComments(xmlComments);  
+                options.SwaggerDoc("v1", new OpenApiInfo
+                {
+                     Title = "Microsoft - Identity HTTP API",
+                    Version = "v1",
+                    Description = "The Identity Service HTTP API",
+                    TermsOfService = new Uri("https://microsoft.com/"),
+                    Contact = new OpenApiContact
+                    {
+                        Name = "Microsoft Contact",
+                        Url = new Uri("https://microsoft.com/")
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Name = "Microsoft License",
+                        Url = new Uri("https://microsoft.com/")
+                    }
+                });
+            });
             var container = new ContainerBuilder();
             container.Populate(services);   
 

src/Services/Ordering/Ordering.API/Application/Behaviors/TransactionBehaviour.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Logging;
 
 public class TransactionBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
+    where TRequest : IRequest<TResponse>
 {
     private readonly ILogger<TransactionBehaviour<TRequest, TResponse>> _logger;
     private readonly OrderingContext _dbContext;

src/Services/Ordering/Ordering.API/Ordering.API.csproj

@@ -8,7 +8,10 @@
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
-
+<PropertyGroup>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);1591</NoWarn>
+	</PropertyGroup>
   <ItemGroup>
     <Content Update="web.config;">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

src/Services/Ordering/Ordering.API/Startup.cs

@@ -214,13 +214,29 @@ static class CustomExtensionsMethods
     public static IServiceCollection AddCustomSwagger(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddSwaggerGen(options =>
-        {            
+        {          
+            var basePath = AppDomain.CurrentDomain.BaseDirectory;
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var xmlComments = Path.Combine(basePath, fileName);
+            options.IncludeXmlComments(xmlComments);  
             options.SwaggerDoc("v1", new OpenApiInfo
             {
                 Title = "eShopOnContainers - Ordering HTTP API",
                 Version = "v1",
-                Description = "The Ordering Service HTTP API"
+                Description = "The Ordering Service HTTP API",
+                TermsOfService = new Uri("https://microsoft.com/terms"),
+                Contact = new OpenApiContact
+                {
+                    Name = "Microsoft Contact",
+                    Url = new Uri("https://microsoft.com/")
+                },
+                License = new OpenApiLicense
+                {
+                    Name = "Microsoft License",
+                    Url = new Uri("https://microsoft.com/")
+                }
             });
+            
             options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
             {
                 Type = SecuritySchemeType.OAuth2,

src/Services/Webhooks/Webhooks.API/GlobalUsings.cs

@@ -48,3 +48,7 @@ global using Webhooks.API.IntegrationEvents;
 global using Webhooks.API.Model;
 global using Webhooks.API.Services;
 global using Webhooks.API;
+global using System.Reflection;
+global using Microsoft.OpenApi.Models;
+global using System.IO;
+

src/Services/Webhooks/Webhooks.API/Startup.cs

@@ -139,11 +139,26 @@ static class CustomExtensionMethods
     {
         services.AddSwaggerGen(options =>
         {            
+            var basePath = AppDomain.CurrentDomain.BaseDirectory;
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var xmlComments = Path.Combine(basePath, fileName);
+            options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo
             {
                 Title = "eShopOnContainers - Webhooks HTTP API",
                 Version = "v1",
-                Description = "The Webhooks Microservice HTTP API. This is a simple webhooks CRUD registration entrypoint"
+                Description = "The Webhooks Microservice HTTP API. This is a simple webhooks CRUD registration entrypoint",
+                TermsOfService = new Uri("https://microsoft.com/"),
+                Contact = new OpenApiContact
+                {
+                    Name = "Microsoft Contact",
+                    Url = new Uri("https://microsoft.com/")
+                },
+                License = new OpenApiLicense
+                {
+                    Name = "Microsoft License",
+                    Url = new Uri("https://microsoft.com/")
+                }
             });
 
             options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme

src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj

@@ -8,7 +8,10 @@
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
-
+  <PropertyGroup>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);1591</NoWarn>
+	</PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />