Skip to content

Commit

Permalink
Merge branch 'main' into support-http-etags-and-if-none-match-header
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Mar 4, 2025
2 parents 7a057ed + 04599ac commit 8d7c4da
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 36 deletions.
6 changes: 0 additions & 6 deletions Applications/AdminApi/src/AdminApi/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,6 @@ static void LoadConfiguration(WebApplicationBuilder webApplicationBuilder, strin
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false)
.AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: true);

if (env.IsDevelopment())
{
var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
webApplicationBuilder.Configuration.AddUserSecrets(appAssembly, optional: true);
}

webApplicationBuilder.Configuration.AddEnvironmentVariables();
webApplicationBuilder.Configuration.AddCommandLine(strings);
}
Expand Down
6 changes: 0 additions & 6 deletions Applications/ConsumerApi/src/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,6 @@ static void LoadConfiguration(WebApplicationBuilder webApplicationBuilder, strin
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false)
.AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: true);

if (env.IsDevelopment())
{
var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
webApplicationBuilder.Configuration.AddUserSecrets(appAssembly, optional: true);
}

webApplicationBuilder.Configuration.AddEnvironmentVariables();
webApplicationBuilder.Configuration.AddCommandLine(strings);
}
6 changes: 0 additions & 6 deletions Applications/DatabaseMigrator/src/DatabaseMigrator/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ static IHostBuilder CreateHostBuilder(string[] args)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
.AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: true);

if (env.IsDevelopment())
{
var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
configuration.AddUserSecrets(appAssembly, optional: true);
}

configuration.AddEnvironmentVariables();
configuration.AddCommandLine(args);
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ static IHostBuilder CreateHostBuilder(string[] args)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
.AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: true);

if (env.IsDevelopment())
{
var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
configuration.AddUserSecrets(appAssembly, optional: true);
}

configuration.AddEnvironmentVariables();
configuration.AddCommandLine(args);
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
.AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: true);

if (env.IsDevelopment())
{
var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
configuration.AddUserSecrets(appAssembly, optional: true);
}

configuration.AddEnvironmentVariables();
configuration.AddCommandLine(args);
})
Expand Down
6 changes: 0 additions & 6 deletions Applications/SseServer/src/SseServer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,6 @@ static void LoadConfiguration(WebApplicationBuilder webApplicationBuilder, strin
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false)
.AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: true);

if (env.IsDevelopment())
{
var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
webApplicationBuilder.Configuration.AddUserSecrets(appAssembly, optional: true);
}

webApplicationBuilder.Configuration.AddEnvironmentVariables();
webApplicationBuilder.Configuration.AddCommandLine(strings);
}

0 comments on commit 8d7c4da

Please sign in to comment.