Ben Adams 6 лет назад
Родитель
Сommit
aa21637d00

+ 14 - 14
frameworks/CSharp/aspnetcore-mono/Benchmarks/Benchmarks.csproj

@@ -16,19 +16,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.3" />
-    <PackageReference Include="MySqlConnector" Version="0.44.1" />
-    <PackageReference Include="Npgsql" Version="4.0.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.1" />
+    <PackageReference Include="MySqlConnector" Version="0.49.2" />
+    <PackageReference Include="Npgsql" Version="4.0.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
@@ -37,7 +37,7 @@
     <Reference Include="netstandard" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading.Tasks" />
-    <PackageReference Include="NETStandard.Library" Version="2.0.0" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">

+ 8 - 9
frameworks/CSharp/aspnetcore-mono/PlatformBenchmarks/PlatformBenchmarks.csproj

@@ -11,15 +11,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.0-rc1-final" />
-    <!-- Fix https://github.com/aspnet/KestrelHttpServer/pull/2562  -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.0-rtm-30793" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.0-rc1-final" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
-    <PackageReference Include="Npgsql" Version="4.0.2" />
-    <PackageReference Include="MySqlConnector" Version="0.44.1" />
+    <PackageReference Include="Npgsql" Version="4.0.4" />
+    <PackageReference Include="MySqlConnector" Version="0.49.2" />
   </ItemGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
@@ -28,7 +27,7 @@
     <Reference Include="netstandard" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading.Tasks" />
-    <PackageReference Include="NETStandard.Library" Version="2.0.0" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
   </ItemGroup>
   
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mvc-ef-pg.dockerfile

@@ -1,12 +1,12 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.postgresql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "Benchmarks.exe", "scenarios=MvcDbSingleQueryEf,MvcDbMultiQueryEf,MvcDbMultiUpdateEf,MvcDbFortunesEf"]

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mvc-my.dockerfile

@@ -1,12 +1,12 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.mysql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "Benchmarks.exe", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbMultiUpdateRaw,MvcDbFortunesRaw"]

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mvc-pg.dockerfile

@@ -1,12 +1,12 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.postgresql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "Benchmarks.exe", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbMultiUpdateRaw,MvcDbFortunesRaw"]

+ 2 - 2
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mvc.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mw-ef-pg.dockerfile

@@ -1,12 +1,12 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.postgresql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "Benchmarks.exe", "scenarios=DbSingleQueryEf,DbMultiQueryEf,DbMultiUpdateEf,DbFortunesEf"]

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mw-my.dockerfile

@@ -1,12 +1,12 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.mysql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "Benchmarks.exe", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbMultiUpdateRaw,DbFortunesRaw"]

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mw-pg.dockerfile

@@ -1,12 +1,12 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.postgresql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "Benchmarks.exe", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbMultiUpdateRaw,DbFortunesRaw"]

+ 2 - 2
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mw.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-my.dockerfile

@@ -1,13 +1,13 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.mysql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV KestrelTransport Libuv
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "PlatformBenchmarks.exe"]

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono-pg.dockerfile

@@ -1,13 +1,13 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.postgresql.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV KestrelTransport Libuv
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "PlatformBenchmarks.exe"]

+ 3 - 3
frameworks/CSharp/aspnetcore-mono/aspcore-mono.dockerfile

@@ -1,13 +1,13 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out
-COPY Benchmarks/appsettings.json ./out/appsettings.json
 
-FROM mono:5.12.0.226 AS runtime
+FROM mono:latest AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV KestrelTransport Libuv
 WORKDIR /app
 COPY --from=build /app/out ./
+COPY Benchmarks/appsettings.json ./appsettings.json
 
 ENTRYPOINT ["mono", "--server", "--gc=sgen", "--gc-params=mode=throughput", "PlatformBenchmarks.exe"]