mirror of
				https://github.com/nsnail/Ocelot.git
				synced 2025-11-04 08:55:28 +08:00 
			
		
		
		
	Feature/merge configuration files (#316)
* #296 renamed configuration.json to ocelot.json in preparation * removed things we dont need for tests * another file we dont need * removed some async we dont need * refactoring to consolidate configuration code * removed another pointless abstraction * #296 started writing merge code * #296 coming up with ideas for this config merging * #296 still hacking this idea around * #296 will now do a crappy merge on the configuration * #296 change so tests pass on windows
This commit is contained in:
		@@ -8,7 +8,7 @@
 | 
			
		||||
    <PackageId>OcelotApplicationApiGateway</PackageId>
 | 
			
		||||
  </PropertyGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
    <None Update="configuration.json;appsettings.json;">
 | 
			
		||||
    <None Update="ocelot.json;appsettings.json;">
 | 
			
		||||
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
			
		||||
    </None>
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
 
 | 
			
		||||
@@ -67,7 +67,7 @@ namespace OcelotApplicationApiGateway
 | 
			
		||||
                        .SetBasePath(hostingContext.HostingEnvironment.ContentRootPath)
 | 
			
		||||
                        .AddJsonFile("appsettings.json", true, true)
 | 
			
		||||
                        .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true)
 | 
			
		||||
                        .AddJsonFile("configuration.json")
 | 
			
		||||
                        .AddJsonFile("ocelot.json")
 | 
			
		||||
                        .AddEnvironmentVariables();
 | 
			
		||||
                })
 | 
			
		||||
               .ConfigureLogging((hostingContext, logging) =>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user