Merge branch 'dev' into prng6

Author: Ramón Tomás

.dockerignore

@@ -28,9 +28,7 @@ cli-linux
 **/obj/
 **/node_modules/
 **/bower_components/
-**/wwwroot/lib/
-!**/wwwroot/lib/signalr/*
-!**/wwwroot/lib/toastr/*
+**/wwwroot/lib/*
 global.json
 **/appsettings.localhost.json
 src/Web/WebSPA/wwwroot/

CONTRIBUTING.md

@@ -0,0 +1,67 @@
+# How to contribute to eShopOnContainers
+
+This repo is a reference and learning resource and everyone is invited to contribute, however not all PRs will be accepted into the main branch (**`dev`**).
+
+There's a general development strategy that's driven by @CESARDELATORRE, who chooses, or defines criteria for choosing, the issues to include in the codebase, given a bunch of constraints and other guidelines.
+
+However you can always get in touch with him, if you want to implement some general-interest feature in your repo and have it referenced from the [documentation](https://docs.microsoft.com/dotnet/standard/microservices-architecture/) or the [Microservices eBook](https://aka.ms/microservicesebook/).
+
+## Coding Standards
+
+There are no explicit coding standards so pay attention to the general coding style, that's (mostly) used everywhere.
+
+However, there's only one **REALLY** important rule: **use spaces for indenting** 😉.
+
+## Development Process
+
+In order to help manage community contributions and avoid conflicts, there's a [Development project](https://github.com/dotnet-architecture/eShopOnContainers/projects/3) in this repo, to track assignments to any significant development effort.
+
+Great but... **what's "significant"**? 
+
+That's not too easy to define and there are no clear criteria right now but, probably, changing "a couple" lines of code in one file would not qualify while changing "a bunch" of files would.
+
+We'll all be learning in the process so we'll figure it out somehow.
+
+### General Steps
+
+1. Issues are managed as usual with the regular issues list, just like any other repo.
+
+2. Once an issue is marked as a bug, enhancement, new feature or whatever needs development work, it will be labeled as a **backlog-item** and included as the last item in the Backlog project column.
+
+3. Community members can propose themselves to code an issue.
+
+4. @CESARDELATORRE/collaborators will prioritize the backlog items and arrange them in the **Backlog** column, so that the items in the top of the list are implemented first.
+
+5. @CESARDELATORRE/collaborators will review the issues and select the ones approved to begin development with, and move them to the **Approved** column.
+
+6. Issues in the **Approved** column can be assigned to a **collaborator** or to a **community member** who would then begin working on the issue and submit a PR as usual.
+
+## Tests
+
+There's not a tests policy in the project at this moment, but it'll be greatly appreciated if you include them within the [updated test structure](./test/readme.md).
+
+## Forks and Branches
+
+All contributions must be submitted as a [Pull Request (PR)](https://help.github.com/articles/about-pull-requests/) so you need to [fork this repo](https://help.github.com/articles/fork-a-repo/) on your GitHub account.
+
+The main branches are **`dev`** and **`master`**:
+
+- **`dev`**: Contains the latest code **and it is the branch actively developed**.  
+**All PRs must be against `dev` branch to be considered**. This branch is developed using .NET Core 2.x
+
+- **`master`**: Synced from time to time from **`dev`**. It contains "stable" code.  
+(**Keep in mind "stable" does not mean PRODUCTION-READY!**)
+
+- Any other branch is considered temporary and could be deleted at any time. Do not submit any PR to them!
+
+## DISCLAIMER - This is not a PRODUCTION-READY TEMPLATE for microservices
+eShopOnContainers is a reference application to **showcase architectural patterns** for developing microservices applications on .NET Core. **IT IS NOT A PRODUCTION-READY TEMPLATE** to start real-world application. In fact, the application is in a **permanent beta state**, as it’s also used to test new potentially interesting technologies as they show up.
+
+Since this is a learning resource, some design decisions have favored simplicity to convey a pattern, over production-grade robustness.
+
+## Suggestions
+
+We hope this helps us all to work better and avoid some of the problems/frustrations of working in such a large community.
+
+We'd also appreciate any comments or ideas to improve this.
+

docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-for-Kindle)-v2.1.01.mobi

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.300"
+    "version": "2.1.401"
   }
-}
+}

docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-for-Kindle).mobi

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
   </ItemGroup>
 

docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-for-eReader)-v2.1.01.epub

@@ -1,4 +1,8 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
+using System;
+using System.Collections.Generic;
+using System.IdentityModel.Tokens.Jwt;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -12,10 +16,6 @@
 using Polly;
 using Polly.Extensions.Http;
 using Swashbuckle.AspNetCore.Swagger;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Net.Http;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
 {
@@ -61,7 +61,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseSwagger().UseSwaggerUI(c =>
            {
                c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1");
-               c.ConfigureOAuth2("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");
+
+               c.OAuthClientId("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui");
+               c.OAuthClientSecret(string.Empty);
+               c.OAuthRealm(string.Empty);
+               c.OAuthAppName("Purchase BFF Swagger UI");
            });
         }
     }
@@ -130,11 +134,9 @@ public static IServiceCollection AddCustomAuthentication(this IServiceCollection
                 {
                     OnAuthenticationFailed = async ctx =>
                     {
-                        int i = 0;
                     },
                     OnTokenValidated = async ctx =>
                     {
-                        int i = 0;
                     }
                 };
             });
@@ -166,15 +168,16 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
             return services;
         }
 
-        static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
+        private static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
         {
             return HttpPolicyExtensions
               .HandleTransientHttpError()
               .OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)
               .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
 
         }
-        static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()
+
+        private static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()
         {
             return HttpPolicyExtensions
                 .HandleTransientHttpError()

docs/NET-Microservices-Architecture-for-Containerized-NET-Applications-(Microsoft-for-eReader).epub

@@ -13,8 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
   </ItemGroup>