Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change object IWebHostEnvironment for new IHostEnvironment of net core #111

Merged
merged 20 commits into from
Jun 18, 2020
Merged

Change object IWebHostEnvironment for new IHostEnvironment of net core #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
762c088
* Fix in the paths when swagger servers are overwriten, it is optiona…
May 18, 2020
a624c20
* added Server of swagger for configuration
May 19, 2020
c498d83
* Revert this file
May 19, 2020
aa5d564
* Modify comment
May 19, 2020
6d6fa3e
Typo changes
Burgyn May 19, 2020
578c125
* Added documentation of change
May 19, 2020
359e1c5
* Added Multifile configuration ocelot and swagger
dadjh85 Jun 10, 2020
bb87789
* blank line removed
dadjh85 Jun 11, 2020
04564cc
* Remove line of file not used
dadjh85 Jun 11, 2020
ac142b3
Merge remote-tracking branch 'upstream/master'
dadjh85 Jun 15, 2020
e4d2b5d
* Added comments
dadjh85 Jun 15, 2020
ee1d247
Remove line not used
dadjh85 Jun 15, 2020
4b0bc09
*fixed test and new documentation on the new extension
dadjh85 Jun 17, 2020
612f0b3
Remove ocelot.json from demo
Burgyn Jun 18, 2020
215c2d9
Fix demo
Burgyn Jun 18, 2020
fbb01d6
Documentation
Burgyn Jun 18, 2020
d45cca7
typo
Burgyn Jun 18, 2020
b4ed078
IsNullOrEmpty
Burgyn Jun 18, 2020
f1c50db
* Change object IWebHostEnvironment for a object IHostEnvironment new…
dadjh85 Jun 18, 2020
ca32743
Merge remote-tracking branch 'upstream/master' into develop
dadjh85 Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions demo/ApiGateway/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using MMLib.SwaggerForOcelot.DependencyInjection;

namespace ApiGateway
Expand All @@ -12,8 +13,8 @@ public static void Main(string[] args)
CreateWebHostBuilder(args).Build().Run();
}

public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
WebHost.CreateDefaultBuilder(args)
public static IHostBuilder CreateWebHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureAppConfiguration((hostingContext, config) =>
{
config
Expand All @@ -25,6 +26,6 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
.AddOcelotWithSwaggerSupport(folder: "Configuration")
.AddEnvironmentVariables();
})
.UseStartup<Startup>();
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
}
}
3 changes: 2 additions & 1 deletion src/MMLib.SwaggerForOcelot/DependencyInjection/ConfigurationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Kros.Extensions;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using MMLib.SwaggerForOcelot.Configuration;
using Newtonsoft.Json;
using System;
Expand Down Expand Up @@ -28,7 +29,7 @@ public static class ConfigurationBuilderExtensions
/// <returns>a Object IConfigurationBuilder</returns>
public static IConfigurationBuilder AddOcelotWithSwaggerSupport(
this IConfigurationBuilder builder,
IWebHostEnvironment environment = null,
IHostEnvironment environment = null,
string folder = "/",
string fileOfSwaggerEndPoints = SwaggerForOcelotFileOptions.SwaggerEndPointsConfigFile)
{
Expand Down