chore: Upgrade from .NET Core 2.1 to .NET Core 3.1 (#1112)

Dockerfile

@@ -1,18 +1,10 @@
-FROM mono:latest
+FROM mcr.microsoft.com/dotnet/sdk:3.1
 
-ENV FrameworkPathOverride /usr/lib/mono/4.5/
-
-RUN apt-get update \
-    && apt-get install -y curl make apt-transport-https
-
-RUN curl -sSL https://packages.microsoft.com/config/ubuntu/19.10/packages-microsoft-prod.deb -o packages-microsoft-prod.deb \
-    && dpkg --install packages-microsoft-prod.deb
+COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt
 
 RUN apt-get update \
-    && apt-get install -y dotnet-sdk-2.1
-
-COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt
-RUN update-ca-certificates
+    && apt-get install -y make apt-transport-https \
+    && update-ca-certificates
 
 COPY . .
 

ExampleCoreProject/ExampleCoreProject.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -16,9 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>

ExampleNet45Project/ExampleNet45.csproj

@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition=" '$(OS)' != 'Windows_NT' " />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" Condition=" '$(OS)' != 'Windows_NT' " />
   </ItemGroup>
 
   <ItemGroup>

examples/eventwebhook/consumer/Dockerfile

@@ -1,21 +1,21 @@
-FROM microsoft/dotnet:2.1-sdk AS build
-WORKDIR /App
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+WORKDIR /app
 
 # copy csproj and restore as distinct layers
 COPY *.sln .
-COPY Src/EventWebhook/*.csproj ./Src/EventWebhook/
-COPY Tests/EventWebhook.Tests/*.csproj ./Tests/EventWebhook.Tests/
+COPY src/EventWebhook/*.csproj ./src/EventWebhook/
+COPY tests/EventWebhook.Tests/*.csproj ./tests/EventWebhook.Tests/
 RUN dotnet restore
 
 # copy everything else and build app
-COPY Src/EventWebhook/. ./Src/EventWebhook/
-WORKDIR /App/Src/EventWebhook
-RUN dotnet publish -c Release -o Out
+COPY src/EventWebhook/. ./src/EventWebhook/
+WORKDIR /app/src/EventWebhook
+RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
-WORKDIR /App
-COPY --from=build /App/Src/EventWebhook/Out ./
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS runtime
+WORKDIR /app
+COPY --from=build /app/src/EventWebhook/out ./
 
-RUN echo "ASPNETCORE_URLS=http://0.0.0.0:\$PORT\nDOTNET_RUNNING_IN_CONTAINER=true" > /App/SetupHerokuEnv.sh && chmod +x /App/SetupHerokuEnv.sh
+RUN echo "ASPNETCORE_URLS=http://0.0.0.0:\$PORT\nDOTNET_RUNNING_IN_CONTAINER=true" > /app/SetupHerokuEnv.sh && chmod +x /app/SetupHerokuEnv.sh
 
-CMD /bin/bash -c "source /App/SetupHerokuEnv.sh && dotnet EventWebhook.dll"
+CMD /bin/bash -c "source /app/SetupHerokuEnv.sh && dotnet EventWebhook.dll"

examples/eventwebhook/consumer/README.md

@@ -42,7 +42,7 @@ cd sendgrid-csharp/examples/eventwebhook/consumer
 
 dotnet restore
 
-dotnet run --project .\Src\EventWebhook\EventWebhook.csproj
+dotnet run --project .\src\EventWebhook\EventWebhook.csproj
 ```
 Above will start server listening on a random port like below
 

examples/eventwebhook/consumer/SendGridEventWebhookConsumer.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{B08185CF-3F2E-4638-877B-587F5F60CA74}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B08185CF-3F2E-4638-877B-587F5F60CA74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventWebhook", "Src\EventWebhook\EventWebhook.csproj", "{3897C29A-AE26-4FE5-8421-71896EC935C5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventWebhook", "src\EventWebhook\EventWebhook.csproj", "{3897C29A-AE26-4FE5-8421-71896EC935C5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{81CAC535-9854-47AD-9D3E-385AC2668C35}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{81CAC535-9854-47AD-9D3E-385AC2668C35}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventWebhook.Tests", "Tests\EventWebhook.Tests\EventWebhook.Tests.csproj", "{5C6AA0EB-57B7-4E76-804A-70F7A7DF4FC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventWebhook.Tests", "tests\EventWebhook.Tests\EventWebhook.Tests.csproj", "{5C6AA0EB-57B7-4E76-804A-70F7A7DF4FC0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution