更换gRPC为托管实现 (Richasy#707)

* Use managed gRPC and upgrade all dependencies * Remove ImageEx ref upgrade * Upgrade references Co-authored-by: Richasy <[email protected]>
HHJLKK · Feb 21, 2022 · 3bc196b · 3bc196b
1 parent ae115f7
commit 3bc196b
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 95 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,7 @@
 
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <PackageReference Include="Microsoft.CodeAnalysis.Metrics">
-      <Version>3.3.0</Version>
+      <Version>3.3.3</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/TestUtils.targets b/TestUtils.targets
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
+        <PackageReference Include="FluentAssertions" Version="6.2.0" />
         <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
         <PackageReference Include="Moq" Version="4.14.5" />
     </ItemGroup>

diff --git a/UnitTests.targets b/UnitTests.targets
@@ -5,9 +5,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
+        <PackageReference Include="FluentAssertions" Version="6.2.0" />
         <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="Moq" Version="4.14.5" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -1027,14 +1027,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FFmpegInteropX">
-      <Version>0.9.2</Version>
+      <Version>0.9.4</Version>
     </PackageReference>
     <PackageReference Include="HN.Controls.ImageEx.Uwp">
       <Version>1.0.33</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Metrics">
-      <Version>3.3.0</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
@@ -1051,13 +1048,13 @@
       <Version>7.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.0-prerelease.210927001</Version>
+      <Version>2.8.0-prerelease.220118001</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="Nito.AsyncEx.Tasks">
-      <Version>5.1.0</Version>
+      <Version>5.1.2</Version>
     </PackageReference>
     <PackageReference Include="Richasy.ExpanderEx.UWP">
       <Version>1.0.4</Version>

diff --git a/src/Controller/Controller.Uwp.UnitTests/Controller.Uwp.UnitTests.csproj b/src/Controller/Controller.Uwp.UnitTests/Controller.Uwp.UnitTests.csproj
@@ -43,13 +43,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions">
-      <Version>5.10.3</Version>
+      <Version>6.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.SDK">
-      <Version>16.7.1</Version>
+      <Version>17.0.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.4.1</Version>

diff --git a/src/Controller/Controller.Uwp/Controller.Uwp.csproj b/src/Controller/Controller.Uwp/Controller.Uwp.csproj
@@ -44,10 +44,10 @@
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.7.11</Version>
+      <Version>4.7.13</Version>
     </PackageReference>
     <PackageReference Include="Websocket.Client">
-      <Version>4.4.39</Version>
+      <Version>4.4.43</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Lib/Lib.Interfaces/Lib.Interfaces.csproj b/src/Lib/Lib.Interfaces/Lib.Interfaces.csproj
@@ -139,7 +139,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
-      <Version>3.17.3</Version>
+      <Version>3.19.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>

diff --git a/src/Lib/Lib.Uwp/Lib.Uwp.csproj b/src/Lib/Lib.Uwp/Lib.Uwp.csproj
@@ -47,19 +47,19 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
-      <Version>3.17.3</Version>
+      <Version>3.19.4</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.11.38</Version>
+      <Version>1.11.42</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.0-prerelease.210927001</Version>
+      <Version>2.8.0-prerelease.220118001</Version>
     </PackageReference>
     <PackageReference Include="ZXing.Net">
-      <Version>0.16.6</Version>
+      <Version>0.16.8</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Models/Models.gRPC/Models.gRPC.csproj b/src/Models/Models.gRPC/Models.gRPC.csproj
@@ -7,73 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="bilibili\account\fission\v1\fission.proto" />
-    <None Remove="bilibili\ad\v1\ad.proto" />
-    <None Remove="bilibili\api\probe\v1\probe.proto" />
-    <None Remove="bilibili\app\archive\middleware\v1\preload.proto" />
-    <None Remove="bilibili\app\archive\v1\archive.proto" />
-    <None Remove="bilibili\app\card\v1\ad.proto" />
-    <None Remove="bilibili\app\card\v1\card.proto" />
-    <None Remove="bilibili\app\card\v1\common.proto" />
-    <None Remove="bilibili\app\card\v1\double.proto" />
-    <None Remove="bilibili\app\card\v1\single.proto" />
-    <None Remove="bilibili\app\dynamic\v1\dynamic.proto" />
-    <None Remove="bilibili\app\dynamic\v2\dynamic.proto" />
-    <None Remove="bilibili\app\interfaces\v1\history.proto" />
-    <None Remove="bilibili\app\interfaces\v1\search.proto" />
-    <None Remove="bilibili\app\playurl\v1\playurl.proto" />
-    <None Remove="bilibili\app\resource\privacy\v1\api.proto" />
-    <None Remove="bilibili\app\resource\v1\module.proto" />
-    <None Remove="bilibili\app\show\gateway\v1\service.proto" />
-    <None Remove="bilibili\app\show\popular\v1\popular.proto" />
-    <None Remove="bilibili\app\show\rank\v1\rank.proto" />
-    <None Remove="bilibili\app\show\region\v1\region.proto" />
-    <None Remove="bilibili\app\space\v1\space.proto" />
-    <None Remove="bilibili\app\splash\v1\splash.proto" />
-    <None Remove="bilibili\app\view\v1\view.proto" />
-    <None Remove="bilibili\app\wall\v1\wall.proto" />
-    <None Remove="bilibili\broadcast\message\editor\notify.proto" />
-    <None Remove="bilibili\broadcast\message\esports\notify.proto" />
-    <None Remove="bilibili\broadcast\message\fission\notify.proto" />
-    <None Remove="bilibili\broadcast\message\im\notify.proto" />
-    <None Remove="bilibili\broadcast\message\main\dm.proto" />
-    <None Remove="bilibili\broadcast\message\main\native.proto" />
-    <None Remove="bilibili\broadcast\message\main\resource.proto" />
-    <None Remove="bilibili\broadcast\message\note\sync.proto" />
-    <None Remove="bilibili\broadcast\message\ogv\freya.proto" />
-    <None Remove="bilibili\broadcast\message\ogv\live.proto" />
-    <None Remove="bilibili\broadcast\message\ticket\activitygame.proto" />
-    <None Remove="bilibili\broadcast\message\tv\proj.proto" />
-    <None Remove="bilibili\broadcast\v1\broadcast.proto" />
-    <None Remove="bilibili\broadcast\v1\laser.proto" />
-    <None Remove="bilibili\broadcast\v1\mod.proto" />
-    <None Remove="bilibili\broadcast\v1\push.proto" />
-    <None Remove="bilibili\broadcast\v1\room.proto" />
-    <None Remove="bilibili\broadcast\v1\test.proto" />
-    <None Remove="bilibili\broadcast\v2\laser.proto" />
-    <None Remove="bilibili\cheese\gateway\player\v1\playurl.proto" />
-    <None Remove="bilibili\community\service\dm\v1\dm.proto" />
-    <None Remove="bilibili\im\interfaces\inner-interface\v1\api.proto" />
-    <None Remove="bilibili\im\interfaces\v1\im.proto" />
-    <None Remove="bilibili\im\type\im.proto" />
-    <None Remove="bilibili\main\common\arch\doll\v1\doll.proto" />
-    <None Remove="bilibili\main\community\reply\v1\reply.proto" />
-    <None Remove="bilibili\metadata\device\device.proto" />
-    <None Remove="bilibili\metadata\fawkes\fawkes.proto" />
-    <None Remove="bilibili\metadata\locale\locale.proto" />
-    <None Remove="bilibili\metadata\metadata.proto" />
-    <None Remove="bilibili\metadata\network\network.proto" />
-    <None Remove="bilibili\metadata\restriction\restriction.proto" />
-    <None Remove="bilibili\pgc\gateway\player\v1\playurl.proto" />
-    <None Remove="bilibili\pgc\gateway\player\v2\playurl.proto" />
-    <None Remove="bilibili\pgc\service\premiere\v1\premiere.proto" />
-    <None Remove="bilibili\rpc\status.proto" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.17.3" />
-    <PackageReference Include="Grpc.Core" Version="2.34.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.34.0">
+    <PackageReference Include="Google.Protobuf" Version="3.19.4" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.42.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.44.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Utilities/Locator/Locator.Uwp.UnitTests/Locator.Uwp.UnitTests.csproj b/src/Utilities/Locator/Locator.Uwp.UnitTests/Locator.Uwp.UnitTests.csproj
@@ -42,13 +42,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions">
-      <Version>5.10.3</Version>
+      <Version>6.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.SDK">
-      <Version>16.7.1</Version>
+      <Version>17.0.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.4.1</Version>

diff --git a/src/Utilities/Toolkit/Toolkit.Uwp.UnitTests/Toolkit.Uwp.UnitTests.csproj b/src/Utilities/Toolkit/Toolkit.Uwp.UnitTests/Toolkit.Uwp.UnitTests.csproj
@@ -42,13 +42,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions">
-      <Version>5.10.3</Version>
+      <Version>6.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.SDK">
-      <Version>16.7.1</Version>
+      <Version>17.0.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.4.1</Version>

diff --git a/src/ViewModels/ViewModels.Uwp.UnitTests/ViewModels.Uwp.UnitTests.csproj b/src/ViewModels/ViewModels.Uwp.UnitTests/ViewModels.Uwp.UnitTests.csproj
@@ -45,10 +45,10 @@
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="SpecFlow">
-      <Version>3.9.22</Version>
+      <Version>3.9.40</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.SDK">
-      <Version>16.7.1</Version>
+      <Version>17.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
@@ -132,7 +132,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FFmpegInteropX">
-      <Version>0.9.2</Version>
+      <Version>0.9.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
       <Version>6.0.0</Version>
@@ -144,10 +144,10 @@
       <Version>7.1.2</Version>
     </PackageReference>
     <PackageReference Include="ReactiveUI">
-      <Version>14.3.1</Version>
+      <Version>17.1.50</Version>
     </PackageReference>
     <PackageReference Include="ReactiveUI.Fody">
-      <Version>14.3.1</Version>
+      <Version>17.1.50</Version>
     </PackageReference>
     <PackageReference Include="Richasy.SYEnginePackage">
       <Version>1.0.0</Version>