更新到.NET Core 2.2

ElderJames · Jan 18, 2019 · 3dcfcd1 · 3dcfcd1
1 parent 6d961c5
commit 3dcfcd1
Show file tree

Hide file tree

Showing 30 changed files with 299 additions and 312 deletions.
diff --git a/samples/Shriek.Samples.Dapper/Shriek.Samples.Dapper.csproj b/samples/Shriek.Samples.Dapper/Shriek.Samples.Dapper.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="Npgsql" Version="3.2.6" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Npgsql" Version="4.0.4" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,8 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/Shriek.Samples.EventStorage.EFCore/Shriek.Samples.EventStorage.EFCore.csproj b/samples/Shriek.Samples.EventStorage.EFCore/Shriek.Samples.EventStorage.EFCore.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Shriek.Samples.EventStorage.InfluxDB/Shriek.Samples.EventStorage.InfluxDB.csproj b/samples/Shriek.Samples.EventStorage.InfluxDB/Shriek.Samples.EventStorage.InfluxDB.csproj
@@ -18,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Shriek.Samples.EventStorage.Mongo/Shriek.Samples.EventStorage.Mongo.csproj b/samples/Shriek.Samples.EventStorage.Mongo/Shriek.Samples.EventStorage.Mongo.csproj
@@ -17,12 +17,12 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Shriek.EventStorage.MongoDB\Shriek.EventStorage.MongoDB.csproj" />

diff --git a/samples/Shriek.Samples.EventStorage.NoSql/Shriek.Samples.EventStorage.NoSql.csproj b/samples/Shriek.Samples.EventStorage.NoSql/Shriek.Samples.EventStorage.NoSql.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteDB" Version="4.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Include="LiteDB" Version="4.1.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Shriek.Samples.RabbitMQ/Shriek.Samples.RabbitMQ.csproj b/samples/Shriek.Samples.RabbitMQ/Shriek.Samples.RabbitMQ.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Shriek.Samples.WebApiProxy/Shriek.Samples.WebApiProxy.csproj b/samples/Shriek.Samples.WebApiProxy/Shriek.Samples.WebApiProxy.csproj
@@ -11,19 +11,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Shriek.ServiceProxy.Abstractions\Shriek.ServiceProxy.Abstractions.csproj" />
     <ProjectReference Include="..\..\src\Shriek.ServiceProxy.Http.Server\Shriek.ServiceProxy.Http.Server.csproj" />
-    <ProjectReference Include="..\..\src\Shriek.ServiceProxy.Http.Tracer.Butterfly\Shriek.ServiceProxy.Http.Tracer.Butterfly.csproj" />
     <ProjectReference Include="..\..\src\Shriek.ServiceProxy.Http\Shriek.ServiceProxy.Http.csproj" />
     <ProjectReference Include="..\..\src\Shriek.ServiceProxy.Socket.Server\Shriek.ServiceProxy.Socket.Server.csproj" />
     <ProjectReference Include="..\..\src\Shriek.ServiceProxy.Socket\Shriek.ServiceProxy.Socket.csproj" />

diff --git a/samples/Shriek.Samples/Shriek.Samples.csproj b/samples/Shriek.Samples/Shriek.Samples.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/shriek-fx.sln b/shriek-fx.sln
@@ -71,16 +71,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.ServiceProxy.Socket"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.ServiceProxy.Socket.Server", "src\Shriek.ServiceProxy.Socket.Server\Shriek.ServiceProxy.Socket.Server.csproj", "{B56E33E0-8105-4B10-89BF-775F9C41486E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.ServiceProxy.Http.Tracer.Butterfly", "src\Shriek.ServiceProxy.Http.Tracer.Butterfly\Shriek.ServiceProxy.Http.Tracer.Butterfly.csproj", "{AD461C1A-CA2C-4B53-85C5-D987DFEA6143}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.Web.Api", "src\Shriek.Web.Api\Shriek.Web.Api.csproj", "{73A3FBCB-E804-4F22-B44F-143BFA32B6EE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.Extensions.Dapper", "src\Shriek.Extensions.Dapper\Shriek.Extensions.Dapper.csproj", "{8F1B03A9-AD55-4EE1-B2C0-B93017099B68}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.ServiceProxy.DotNetty", "src\Shriek.ServiceProxy,DotNetty\Shriek.ServiceProxy.DotNetty.csproj", "{A38BE26C-63C5-43DB-9A45-0BB3A930E2BA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.Extensions.SmartSql", "src\Shriek.Extensions.SmartSql\Shriek.Extensions.SmartSql.csproj", "{B0AC42DA-137B-4505-AA19-8C94978B5A72}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shriek.NLog.Kafka", "src\Shriek.NLog.Kafka\Shriek.NLog.Kafka.csproj", "{236BB861-35E5-470E-BB14-E2A215027D70}"
 EndProject
 Global
@@ -193,10 +189,6 @@ Global
 		{B56E33E0-8105-4B10-89BF-775F9C41486E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B56E33E0-8105-4B10-89BF-775F9C41486E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B56E33E0-8105-4B10-89BF-775F9C41486E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD461C1A-CA2C-4B53-85C5-D987DFEA6143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD461C1A-CA2C-4B53-85C5-D987DFEA6143}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD461C1A-CA2C-4B53-85C5-D987DFEA6143}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD461C1A-CA2C-4B53-85C5-D987DFEA6143}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73A3FBCB-E804-4F22-B44F-143BFA32B6EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73A3FBCB-E804-4F22-B44F-143BFA32B6EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73A3FBCB-E804-4F22-B44F-143BFA32B6EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -209,10 +201,6 @@ Global
 		{A38BE26C-63C5-43DB-9A45-0BB3A930E2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A38BE26C-63C5-43DB-9A45-0BB3A930E2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A38BE26C-63C5-43DB-9A45-0BB3A930E2BA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0AC42DA-137B-4505-AA19-8C94978B5A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0AC42DA-137B-4505-AA19-8C94978B5A72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0AC42DA-137B-4505-AA19-8C94978B5A72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0AC42DA-137B-4505-AA19-8C94978B5A72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{236BB861-35E5-470E-BB14-E2A215027D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{236BB861-35E5-470E-BB14-E2A215027D70}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{236BB861-35E5-470E-BB14-E2A215027D70}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -250,11 +238,9 @@ Global
 		{CB140925-FF8C-4444-9F69-52FD3F0C88E7} = {D89488AA-4409-4E15-9945-A918008FBA0A}
 		{210FAE89-137D-4F32-AE7A-9C8DE3E8D904} = {F0BFC07A-EBF5-48D7-8F60-9AEA7B94847A}
 		{B56E33E0-8105-4B10-89BF-775F9C41486E} = {F0BFC07A-EBF5-48D7-8F60-9AEA7B94847A}
-		{AD461C1A-CA2C-4B53-85C5-D987DFEA6143} = {F0BFC07A-EBF5-48D7-8F60-9AEA7B94847A}
 		{73A3FBCB-E804-4F22-B44F-143BFA32B6EE} = {5F35B0CE-D94D-4526-ABE2-D03927AAA1B1}
 		{8F1B03A9-AD55-4EE1-B2C0-B93017099B68} = {5F35B0CE-D94D-4526-ABE2-D03927AAA1B1}
 		{A38BE26C-63C5-43DB-9A45-0BB3A930E2BA} = {F0BFC07A-EBF5-48D7-8F60-9AEA7B94847A}
-		{B0AC42DA-137B-4505-AA19-8C94978B5A72} = {5F35B0CE-D94D-4526-ABE2-D03927AAA1B1}
 		{236BB861-35E5-470E-BB14-E2A215027D70} = {5F35B0CE-D94D-4526-ABE2-D03927AAA1B1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/Shriek.EntityFrameworkCore/Shriek.EntityFrameworkCore.csproj b/src/Shriek.EntityFrameworkCore/Shriek.EntityFrameworkCore.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Shriek.EventBus.RabbitMQ/Shriek.Messages.RabbitMQ.csproj b/src/Shriek.EventBus.RabbitMQ/Shriek.Messages.RabbitMQ.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="RabbitMQ.Client" Version="5.1.0-pre1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shriek.EventStorage.Dapper/Shriek.EventStorage.Dapper.csproj b/src/Shriek.EventStorage.Dapper/Shriek.EventStorage.Dapper.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="1.50.4" />
+    <PackageReference Include="Dapper" Version="1.50.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shriek.EventStorage.EFCore/Shriek.EventStorage.EFCore.csproj b/src/Shriek.EventStorage.EFCore/Shriek.EventStorage.EFCore.csproj
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shriek.EventStorage.LiteDB/Shriek.EventStorage.LiteDB.csproj b/src/Shriek.EventStorage.LiteDB/Shriek.EventStorage.LiteDB.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteDB" Version="4.1.1" />
+    <PackageReference Include="LiteDB" Version="4.1.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shriek.EventStorage.MongoDB/Shriek.EventStorage.MongoDB.csproj b/src/Shriek.EventStorage.MongoDB/Shriek.EventStorage.MongoDB.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
-    <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shriek.EventStorage.Redis/Shriek.EventStorage.Redis.csproj b/src/Shriek.EventStorage.Redis/Shriek.EventStorage.Redis.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Shriek.Extensions.Dapper/Shriek.Extensions.Dapper.csproj b/src/Shriek.Extensions.Dapper/Shriek.Extensions.Dapper.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <Import Project="..\..\build\net46.props" />
 
@@ -7,10 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="1.50.4" />
+    <PackageReference Include="Dapper" Version="1.50.5" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
   </ItemGroup>
 </Project>