return ocelote to 2.2 for incompatibility of 3.0

erikpique · erikpique · commit 1c88396c99f1 · 2019-08-02T12:26:13.000+02:00
diff --git a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
@@ -1,19 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>$(LangVersion)</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="$(AspNetCore_HealthChecks_UI_Client)" />
-    <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="$(AspNetCore_HealthChecks_Uris)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="$(Microsoft_AspNetCore_Diagnostics_HealthChecks)" />
-    <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="$(Microsoft_AspNetCore_HealthChecks)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="$(Microsoft_AspNetCore_Mvc_Formatters_Json)" />
-    <PackageReference Include="Ocelot" Version="$(Ocelot)" />
-    <PackageReference Include="Serilog.AspNetCore" Version="$(Serilog_AspNetCore)" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="$(Serilog_Sinks_Console)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(Microsoft_AspNetCore_Authentication_JwtBearer)" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.2" />
+    <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
+    <PackageReference Include="Ocelot" Version="12.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
 </Project>
diff --git a/src/ApiGateways/ApiGw-Base/Startup.cs b/src/ApiGateways/ApiGw-Base/Startup.cs
@@ -89,19 +89,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseRouting();
-            app.UseEndpoints(endpoints =>
+            app.UseHealthChecks("/hc", new HealthCheckOptions()
             {
-                endpoints.MapControllers();
-                endpoints.MapHealthChecks("/hc", new HealthCheckOptions()
-                {
-                    Predicate = _ => true,
-                    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
-                });
-                endpoints.MapHealthChecks("/liveness", new HealthCheckOptions
-                {
-                    Predicate = r => r.Name.Contains("self")
-                });
+                Predicate = _ => true,
+                ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
+            });
+
+            app.UseHealthChecks("/liveness", new HealthCheckOptions
+            {
+                Predicate = r => r.Name.Contains("self")
             });
 
             app.UseCors("CorsPolicy");
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
@@ -50,7 +50,7 @@ public void ConfigureServices(IServiceCollection services)
                  .AddDevspaces()
                  .AddHttpServices();
 
-            services.AddControllers();
+            services.AddControllers().AddNewtonsoftJson();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -79,6 +79,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseHttpsRedirection();
             app.UseRouting();
             app.UseAuthentication();
+            app.UseAuthorization();
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapDefaultControllerRoute();
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
@@ -51,7 +51,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AddDevspaces()
                 .AddApplicationServices();
 
-            services.AddControllers();
+            services.AddControllers().AddNewtonsoftJson();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -77,6 +77,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             }
 
             app.UseAuthentication();
+            app.UseAuthorization();
             app.UseHttpsRedirection();
             app.UseRouting();
             app.UseEndpoints(endpoints =>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void ConfigureServices(IServiceCollection services)`
`50`	`50`	`.AddDevspaces()`
`51`	`51`	`.AddHttpServices();`
`52`	`52`
`53`		`- services.AddControllers();`
	`53`	`+ services.AddControllers().AddNewtonsoftJson();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`@@ -79,6 +79,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`79`	`79`	`app.UseHttpsRedirection();`
`80`	`80`	`app.UseRouting();`
`81`	`81`	`app.UseAuthentication();`
	`82`	`+ app.UseAuthorization();`
`82`	`83`	`app.UseEndpoints(endpoints =>`
`83`	`84`	`{`
`84`	`85`	`endpoints.MapDefaultControllerRoute();`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void ConfigureServices(IServiceCollection services)`
`51`	`51`	`.AddDevspaces()`
`52`	`52`	`.AddApplicationServices();`
`53`	`53`
`54`		`- services.AddControllers();`
	`54`	`+ services.AddControllers().AddNewtonsoftJson();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`@@ -77,6 +77,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`app.UseAuthentication();`
	`80`	`+ app.UseAuthorization();`
`80`	`81`	`app.UseHttpsRedirection();`
`81`	`82`	`app.UseRouting();`
`82`	`83`	`app.UseEndpoints(endpoints =>`