Browse Source

Update Carter (#5485)

* Update Carter

* Just incase

* Fixes
Ben Adams 5 years ago
parent
commit
d37ba0db2c

+ 2 - 5
frameworks/CSharp/carter/Benchmarks/Benchmarks.csproj

@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Carter" Version="3.11.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Carter" Version="5.1.0" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
   </ItemGroup>
   </ItemGroup>
 </Project>
 </Project>

+ 2 - 4
frameworks/CSharp/carter/Benchmarks/JsonModule.cs

@@ -10,7 +10,7 @@
 
 
         public JsonModule() : base("json")
         public JsonModule() : base("json")
         {
         {
-            Get("/", (req, res, routeData) =>
+            Get("/", (req, res) =>
             {
             {
                 res.StatusCode = 200;
                 res.StatusCode = 200;
                 res.ContentType = "application/json";
                 res.ContentType = "application/json";
@@ -18,9 +18,7 @@
 
 
                 var msg = new JsonMessage { message = "Hello, World!" };
                 var msg = new JsonMessage { message = "Hello, World!" };
 
 
-                JsonSerializer.Serialize(res.Body, msg);
-
-                return Task.CompletedTask;
+                return JsonSerializer.SerializeAsync(res.Body, msg);
             });
             });
         }
         }
 
 

+ 1 - 1
frameworks/CSharp/carter/Benchmarks/PlainModule.cs

@@ -9,7 +9,7 @@
 
 
         public PlainModule() : base("plaintext")
         public PlainModule() : base("plaintext")
         {
         {
-            Get("/", (req, res, routeData) =>
+            Get("/", (req, res) =>
             {
             {
                 var payloadLength = _helloWorldPayload.Length;
                 var payloadLength = _helloWorldPayload.Length;
                 res.StatusCode = 200;
                 res.StatusCode = 200;

+ 2 - 1
frameworks/CSharp/carter/Benchmarks/Startup.cs

@@ -13,7 +13,8 @@ namespace Benchmarks
 
 
         public void Configure(IApplicationBuilder app)
         public void Configure(IApplicationBuilder app)
         {
         {
-            app.UseCarter();
+            app.UseRouting();
+            app.UseEndpoints(builder => builder.MapCarter());
         }
         }
     }
     }
 }
 }

+ 2 - 3
frameworks/CSharp/carter/carter.dockerfile

@@ -1,11 +1,10 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
 WORKDIR /app
 WORKDIR /app
 COPY Benchmarks .
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 RUN dotnet publish -c Release -o out
 
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS runtime
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV ASPNETCORE_URLS http://+:8080
-ENV COMPlus_ReadyToRun 0
 WORKDIR /app
 WORKDIR /app
 COPY --from=build /app/out ./
 COPY --from=build /app/out ./