Skip to content

Commit

Permalink
Merge pull request #402 from Cysharp/feature/UpdateNuGetPackages
Browse files Browse the repository at this point in the history
Update NuGet packages
  • Loading branch information
mayuki authored Feb 1, 2021
2 parents fed3ae4 + ad21f52 commit e085093
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions sandbox/Sandbox.AspNetCore/Sandbox.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.30.0" />
<PackageReference Include="MessagePack" Version="2.1.90" />
<PackageReference Include="MessagePack.UnityShims" Version="1.9.11" />
<PackageReference Include="MessagePack.UnityShims" Version="2.2.85" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MagicOnion.Abstractions/MagicOnion.Abstractions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ MagicOnion.IgnoreAttribute</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Core.Api" Version="2.25.0" />
<PackageReference Include="MessagePack" Version="2.1.90" />
<PackageReference Include="Grpc.Core.Api" Version="2.35.0" />
<PackageReference Include="MessagePack" Version="2.2.85" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MagicOnion.Client/MagicOnion.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
<PackageReference Include="Grpc.Net.Client" Version="2.30.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.34.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Grpc" Version="2.30.0" />
<PackageReference Include="Grpc" Version="2.35.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.30.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/MagicOnion.Server.Redis/MagicOnion.Server.Redis.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand All @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.1.90" />
<PackageReference Include="MessagePack" Version="2.2.85" />
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/MagicOnion.Server/MagicOnion.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
Expand All @@ -14,8 +14,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.30.0" />
<PackageReference Include="Grpc.Core.Api" Version="2.30.0" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.34.0" />
<PackageReference Include="Grpc.Core.Api" Version="2.35.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MagicOnion.Shared/MagicOnion.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Core.Api" Version="2.30.0" />
<PackageReference Include="Grpc.Core.Api" Version="2.35.0" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/MagicOnion/MagicOnion.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MagicOnion.Abstractions\MagicOnion.Abstractions.csproj" />
<ProjectReference Include="..\MagicOnion.Server\MagicOnion.Server.csproj" />
<ProjectReference Include="..\MagicOnion.Client\MagicOnion.Client.csproj" />
</ItemGroup>
Expand Down

0 comments on commit e085093

Please sign in to comment.