Merge master

This commit is contained in:
2020-03-01 20:41:52 +01:00
2 changed files with 17 additions and 7 deletions

View File

@@ -15,7 +15,7 @@ namespace EstusShots.Server
public IConfiguration Configuration { get; }
private bool IsDevelopment { get; set; }
public Startup(IConfiguration configuration)
{
Configuration = configuration;
@@ -34,17 +34,19 @@ namespace EstusShots.Server
services.AddControllers().AddJsonOptions(options =>
{
options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
if (IsDevelopment) options.JsonSerializerOptions.WriteIndented = true;
if (IsDevelopment)
{
options.JsonSerializerOptions.WriteIndented = true;
}
});
services.AddSwaggerGen(options =>
{
options.SwaggerDoc("v1", new OpenApiInfo {Title = "Estus Shots API", Version = "v1"});
options.SwaggerDoc("v1", new OpenApiInfo { Title = "Estus Shots API", Version = "v1" });
});
// Register business logic services
services.AddScoped<SeasonsService>();
services.AddScoped<EpisodesService>();
services.AddScoped<PlayersService>();
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -53,15 +55,19 @@ namespace EstusShots.Server
IsDevelopment = env.IsDevelopment();
if (IsDevelopment)
app.UseDeveloperExceptionPage();
else
app.UseHttpsRedirection();
// Do not Redirect for now. Breaks local tests.
// app.UseHttpsRedirection();
// Enable middleware to serve generated Swagger as a JSON endpoint.
app.UseSwagger();
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
// specifying the Swagger JSON endpoint.
app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "Estus Shots API V1"); });
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "Estus Shots API V1");
});
app.UseRouting();
app.UseAuthorization();

View File

@@ -1,5 +1,9 @@
#!/usr/bin/env bash
# Clean up
echo "Cleaning up build directory"
[ -d "Publish" ] && rm -r Publish
# Publish Server
echo "Running dotnet publish for server"
dotnet publish \