diff --git a/template/csharp-httprequest/Dockerfile b/template/csharp-httprequest/Dockerfile index 95953be..a5ce0dd 100644 --- a/template/csharp-httprequest/Dockerfile +++ b/template/csharp-httprequest/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 as watchdog +FROM alpine:3.12 as watchdog RUN apk --no-cache add curl \ && echo "Pulling watchdog binary from Github." \ @@ -7,15 +7,15 @@ RUN apk --no-cache add curl \ && cp /usr/bin/fwatchdog /home/app \ && apk del curl --no-cache -FROM mcr.microsoft.com/dotnet/core/sdk:2.2 as builder +FROM mcr.microsoft.com/dotnet/sdk:5.0 as builder # Supress collection of data. ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 # Optimize for Docker builder caching by adding projects first. -RUN mkdir -p /home/app/function -WORKDIR /home/app/function +RUN mkdir -p /home/app/src/function +WORKDIR /home/app/src/function COPY ./function/Function.csproj . WORKDIR /home/app/src/ @@ -26,7 +26,7 @@ COPY . . RUN dotnet publish -c release -o published -FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 +FROM mcr.microsoft.com/dotnet/aspnet:5.0.0 COPY --from=watchdog /usr/bin/fwatchdog /usr/bin/ diff --git a/template/csharp-httprequest/Program.cs b/template/csharp-httprequest/Program.cs index 20c3165..e7c541c 100644 --- a/template/csharp-httprequest/Program.cs +++ b/template/csharp-httprequest/Program.cs @@ -1,12 +1,16 @@ -using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; public class Program { - public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run(); + public static void Main(string[] args) => CreateHostBuilder(args).Build().Run(); - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseUrls("http://localhost:5000"); + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseKestrel(); + webBuilder.UseStartup(); + webBuilder.UseUrls("http://localhost:5000"); + }); } diff --git a/template/csharp-httprequest/Startup.cs b/template/csharp-httprequest/Startup.cs index 5b4b00f..dd76da7 100644 --- a/template/csharp-httprequest/Startup.cs +++ b/template/csharp-httprequest/Startup.cs @@ -11,7 +11,7 @@ public void ConfigureServices(IServiceCollection services) { } - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { app.Run(async (context) => { diff --git a/template/csharp-httprequest/root.csproj b/template/csharp-httprequest/root.csproj index fde3a18..d707919 100644 --- a/template/csharp-httprequest/root.csproj +++ b/template/csharp-httprequest/root.csproj @@ -1,8 +1,7 @@ - - + Exe - netcoreapp2.2 + net5.0 false false false @@ -18,7 +17,7 @@ - + + -