luxick/EstusShots-Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
luxick
2020-03-01 20:41:52 +01:00
parent ab43075df8 0b7e4ac7e0
commit dd5c2c7cec
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
EstusShots.Server/Startup.cs
View File

@@ -15,7 +15,7 @@ namespace EstusShots.Server
public IConfiguration Configuration { get; } public IConfiguration Configuration { get; }
private bool IsDevelopment { get; set; } private bool IsDevelopment { get; set; }
public Startup(IConfiguration configuration) public Startup(IConfiguration configuration)
{ {
Configuration = configuration; Configuration = configuration;
@@ -34,17 +34,19 @@ namespace EstusShots.Server
services.AddControllers().AddJsonOptions(options => services.AddControllers().AddJsonOptions(options =>
{ {
options.JsonSerializerOptions.PropertyNameCaseInsensitive = true; options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
if (IsDevelopment) options.JsonSerializerOptions.WriteIndented = true; if (IsDevelopment)
{
options.JsonSerializerOptions.WriteIndented = true;
}
}); });
services.AddSwaggerGen(options => 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 // Register business logic services
services.AddScoped<SeasonsService>(); services.AddScoped<SeasonsService>();
services.AddScoped<EpisodesService>(); services.AddScoped<EpisodesService>();
services.AddScoped<PlayersService>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // 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(); IsDevelopment = env.IsDevelopment();
if (IsDevelopment) if (IsDevelopment)
app.UseDeveloperExceptionPage(); 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. // Enable middleware to serve generated Swagger as a JSON endpoint.
app.UseSwagger(); app.UseSwagger();
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.), // Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
// specifying the Swagger JSON endpoint. // 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.UseRouting();
app.UseAuthorization(); app.UseAuthorization();

4
publish.sh
View File

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