清理代码引用及更新依赖 (#1285)

Richasy · Jun 29, 2022 · 2db0a4c · 2db0a4c
1 parent abbfc0f
commit 2db0a4c
Show file tree

Hide file tree

Showing 37 changed files with 19 additions and 51 deletions.
diff --git a/App.ruleset b/App.ruleset
@@ -78,6 +78,7 @@
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA0001" Action="None" />
+    <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1101" Action="None" />
     <Rule Id="SA1309" Action="None" />
     <Rule Id="SA1402" Action="None" />

diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -1357,7 +1357,7 @@
       <Version>1.1.150</Version>
     </PackageReference>
     <PackageReference Include="Splat">
-      <Version>14.3.1</Version>
+      <Version>14.3.4</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>

diff --git a/src/App/Controls/App/TipPopup.xaml.cs b/src/App/Controls/App/TipPopup.xaml.cs
@@ -1,7 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
-using System.Threading.Tasks;
 using Bili.App.Pages.Desktop;
 using Bili.Models.Enums.App;
 using Windows.UI.Xaml;

diff --git a/src/App/Controls/Article/ArticleItem/ArticleItem.cs b/src/App/Controls/Article/ArticleItem/ArticleItem.cs
@@ -20,7 +20,7 @@ public sealed class ArticleItem : ReactiveControl<ArticleItemViewModel>, IRepeat
         public ArticleItem() => DefaultStyleKey = typeof(ArticleItem);
 
         /// <inheritdoc/>
-        public Size GetHolderSize() => new (210, 248);
+        public Size GetHolderSize() => new(210, 248);
 
         /// <inheritdoc/>
         public void ChangeLayout(Orientation orientation)

diff --git a/src/App/Controls/Common/HorizontalRepeaterView.xaml.cs b/src/App/Controls/Common/HorizontalRepeaterView.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using Bili.ViewModels.Uwp;
 using Bili.ViewModels.Uwp.Core;
 using Splat;
 using Windows.UI.Xaml;

diff --git a/src/App/Controls/Community/CommentMainView/CommentMainView.cs b/src/App/Controls/Community/CommentMainView/CommentMainView.cs
@@ -3,9 +3,7 @@
 using System;
 using Bili.Models.App.Other;
 using Bili.ViewModels.Uwp.Community;
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
 
 namespace Bili.App.Controls.Community
 {

diff --git a/src/App/Controls/Danmaku/DanmakuView/DanmakuView.Properties.cs b/src/App/Controls/Danmaku/DanmakuView/DanmakuView.Properties.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using Atelier39;
 using Microsoft.Graphics.Canvas.UI.Xaml;

diff --git a/src/App/Controls/Favorite/PgcFavoritePanel.xaml.cs b/src/App/Controls/Favorite/PgcFavoritePanel.xaml.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Linq;
-using Bili.ViewModels.Uwp;
 using Bili.ViewModels.Uwp.Base;
 using Bili.ViewModels.Uwp.Core;
 using Bili.ViewModels.Uwp.Pgc;

diff --git a/src/App/Controls/Live/LiveItem/LiveItem.cs b/src/App/Controls/Live/LiveItem/LiveItem.cs
@@ -21,7 +21,7 @@ public LiveItem()
             => DefaultStyleKey = typeof(LiveItem);
 
         /// <inheritdoc/>
-        public Size GetHolderSize() => new (210, 248);
+        public Size GetHolderSize() => new(210, 248);
 
         /// <inheritdoc/>
         public void ChangeLayout(Orientation orientation)

diff --git a/src/App/Controls/Player/BiliMediaPlayer/BiliMediaPlayer.cs b/src/App/Controls/Player/BiliMediaPlayer/BiliMediaPlayer.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Richasy. All rights reserved.
 
 using System;
-using System.Diagnostics;
 using Bili.App.Controls.Danmaku;
 using Bili.ViewModels.Uwp.Core;
 using Windows.UI.Input;

diff --git a/src/App/Controls/Player/DownloadOptionsPanel.xaml.cs b/src/App/Controls/Player/DownloadOptionsPanel.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.ViewModels.Uwp.Common;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;

diff --git a/src/App/Controls/Player/PgcExtraView.xaml.cs b/src/App/Controls/Player/PgcExtraView.xaml.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Richasy. All rights reserved.
 
 using System;
-using Bili.ViewModels.Uwp;
 using Bili.ViewModels.Uwp.Pgc;
 using ReactiveUI;
 using Splat;

diff --git a/src/App/Controls/Search/SearchVideoView.xaml.cs b/src/App/Controls/Search/SearchVideoView.xaml.cs
@@ -1,7 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using Windows.UI.Xaml;
-
 namespace Bili.App.Controls
 {
     /// <summary>

diff --git a/src/App/Pages/Desktop/Overlay/FansPage.xaml.cs b/src/App/Pages/Desktop/Overlay/FansPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.Data.User;
 using Bili.ViewModels.Uwp.Community;
 using Windows.UI.Xaml.Navigation;

diff --git a/src/App/Pages/Desktop/Overlay/FollowsPage.xaml.cs b/src/App/Pages/Desktop/Overlay/FollowsPage.xaml.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
-using Bili.App.Controls;
 using Bili.Models.Data.User;
-using Bili.ViewModels.Uwp;
 using Bili.ViewModels.Uwp.Community;
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Navigation;
 
 namespace Bili.App.Pages.Desktop.Overlay

diff --git a/src/App/Pages/RootPage.xaml.cs b/src/App/Pages/RootPage.xaml.cs
@@ -11,7 +11,6 @@
 using Bili.App.Controls.Dialogs;
 using Bili.App.Pages.Desktop.Overlay;
 using Bili.Models.App.Args;
-using Bili.Models.Data.Video;
 using Bili.Models.Enums;
 using Bili.Models.Enums.App;
 using Bili.ViewModels.Uwp.Account;

diff --git a/src/App/Pages/Xbox/Overlay/VideoPlayerPage.xaml.cs b/src/App/Pages/Xbox/Overlay/VideoPlayerPage.xaml.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Local;
 using Bili.Models.Data.Video;

diff --git a/src/Lib/DI.App/DI.App.csproj b/src/Lib/DI.App/DI.App.csproj
@@ -129,12 +129,12 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
-      <Version>1.1.33</Version>
+      <Version>1.1.69</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Splat.NLog">
-      <Version>14.3.1</Version>
+      <Version>14.3.4</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Lib/DI.Task/DI.Task.csproj b/src/Lib/DI.Task/DI.Task.csproj
@@ -129,7 +129,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
-      <Version>1.1.33</Version>
+      <Version>1.1.69</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Lib/Lib.Implementation/ArticleProvider/ArticleProvider.cs b/src/Lib/Lib.Implementation/ArticleProvider/ArticleProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;

diff --git a/src/Lib/Lib.Implementation/CommunityProvider/CommunityProvider.cs b/src/Lib/Lib.Implementation/CommunityProvider/CommunityProvider.cs
@@ -170,7 +170,7 @@ public async Task<DynamicView> GetDynamicComprehensiveListAsync()
             var request = await _httpProvider.GetRequestMessageAsync(Community.DynamicAll, req, true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync(response, DynAllReply.Parser);
-            _comprehensiveDynamicOffset = new (result.DynamicList.HistoryOffset, result.DynamicList.UpdateBaseline);
+            _comprehensiveDynamicOffset = new(result.DynamicList.HistoryOffset, result.DynamicList.UpdateBaseline);
             return _dynamicAdapter.ConvertToDynamicView(result);
         }
 
@@ -189,7 +189,7 @@ public async Task<DynamicView> GetDynamicVideoListAsync()
             var request = await _httpProvider.GetRequestMessageAsync(Community.DynamicVideo, req, true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync(response, DynVideoReply.Parser);
-            _videoDynamicOffset = new (result.DynamicList.HistoryOffset, result.DynamicList.UpdateBaseline);
+            _videoDynamicOffset = new(result.DynamicList.HistoryOffset, result.DynamicList.UpdateBaseline);
             return _dynamicAdapter.ConvertToDynamicView(result);
         }
 
@@ -218,11 +218,11 @@ public async Task<bool> LikeDynamicAsync(string dynamicId, bool isLike, string u
 
         /// <inheritdoc/>
         public void ResetVideoDynamicStatus()
-            => _videoDynamicOffset = new (string.Empty, string.Empty);
+            => _videoDynamicOffset = new(string.Empty, string.Empty);
 
         /// <inheritdoc/>
         public void ResetComprehensiveDynamicStatus()
-            => _comprehensiveDynamicOffset = new (string.Empty, string.Empty);
+            => _comprehensiveDynamicOffset = new(string.Empty, string.Empty);
 
         /// <inheritdoc/>
         public void ResetMainCommentsStatus()

diff --git a/src/Lib/Lib.Implementation/Lib.Implementation.csproj b/src/Lib/Lib.Implementation/Lib.Implementation.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.21.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
     <PackageReference Include="Websocket.Client" Version="4.4.43" />
   </ItemGroup>

diff --git a/src/Lib/Lib.Interfaces/IFavoriteProvider.cs b/src/Lib/Lib.Interfaces/IFavoriteProvider.cs
@@ -2,7 +2,6 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Bili.Models.BiliBili;
 using Bili.Models.Data.Article;
 using Bili.Models.Data.Pgc;
 using Bili.Models.Data.Video;

diff --git a/src/Lib/Lib.Interfaces/IPgcProvider.cs b/src/Lib/Lib.Interfaces/IPgcProvider.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bili.Models.App;
-using Bili.Models.BiliBili;
 using Bili.Models.Data.Appearance;
 using Bili.Models.Data.Pgc;
 using Bili.Models.Enums;

diff --git a/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj b/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj
@@ -137,7 +137,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="Splat.SimpleInjector">
-      <Version>14.3.1</Version>
+      <Version>14.3.4</Version>
     </PackageReference>
     <PackageReference Include="ZXing.Net">
       <Version>0.16.8</Version>

diff --git a/src/Models/Models.Data/Appearance/Image.cs b/src/Models/Models.Data/Appearance/Image.cs
@@ -75,7 +75,7 @@ public Image()
         /// </summary>
         /// <returns>图片地址. 如果没有修改过图片链接则返回 <see cref="Uri"/>.</returns>
         public Uri GetSourceUri()
-            => new (_sourceUri ?? Uri);
+            => new(_sourceUri ?? Uri);
 
         /// <inheritdoc/>
         public override bool Equals(object obj) => obj is Image image && _sourceUri == image._sourceUri;

diff --git a/src/Models/Models.Data/Video/VideoFavoriteFolderGroup.cs b/src/Models/Models.Data/Video/VideoFavoriteFolderGroup.cs
@@ -1,7 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System.Collections.Generic;
-
 namespace Bili.Models.Data.Video
 {
     /// <summary>

diff --git a/src/Models/Models.gRPC/Models.gRPC.csproj b/src/Models/Models.gRPC/Models.gRPC.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.21.2" />
     <PackageReference Include="Grpc.Net.Client" Version="2.46.0" />
     <PackageReference Include="Grpc.Tools" Version="2.47.0">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Tasks/Tasks.csproj b/src/Tasks/Tasks.csproj
@@ -126,7 +126,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
-      <Version>3.21.1</Version>
+      <Version>3.21.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>

diff --git a/...Models/ViewModels.Uwp/Account/MyFollowsPageViewModel/MyFollowsPageViewModel.Properties.cs b/...Models/ViewModels.Uwp/Account/MyFollowsPageViewModel/MyFollowsPageViewModel.Properties.cs
@@ -5,7 +5,6 @@
 using System.Reactive;
 using Bili.Lib.Interfaces;
 using Bili.Models.Data.Community;
-using Bili.Models.Data.User;
 using Bili.Toolkit.Interfaces;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;

diff --git a/...s.Uwp/Article/ArticleFavoriteModuleViewModel/ArticleFavoriteModuleViewModel.Properties.cs b/...s.Uwp/Article/ArticleFavoriteModuleViewModel/ArticleFavoriteModuleViewModel.Properties.cs
@@ -1,7 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
-using System.Collections.ObjectModel;
 using Bili.Lib.Interfaces;
 using Bili.Toolkit.Interfaces;
 using ReactiveUI.Fody.Helpers;

diff --git a/...ewModels/ViewModels.Uwp/Community/CommentPageViewModel/CommentPageViewModel.Properties.cs b/...ewModels/ViewModels.Uwp/Community/CommentPageViewModel/CommentPageViewModel.Properties.cs
@@ -1,7 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System.Reactive;
-using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
 namespace Bili.ViewModels.Uwp.Community

diff --git a/src/ViewModels/ViewModels.Uwp/Community/MessagePageViewModel/MessagePageViewModel.cs b/src/ViewModels/ViewModels.Uwp/Community/MessagePageViewModel/MessagePageViewModel.cs
@@ -95,7 +95,7 @@ protected override async Task GetDataAsync()
             }
 
             _caches.Remove(CurrentType.Type);
-            _caches.Add(CurrentType.Type, new (Items.Select(p => p.Information).ToList(), _isEnd));
+            _caches.Add(CurrentType.Type, new(Items.Select(p => p.Information).ToList(), _isEnd));
             IsEmpty = Items.Count == 0;
             _accountViewModel.InitializeUnreadCommand.Execute().Subscribe();
         }

diff --git a/src/ViewModels/ViewModels.Uwp/Core/AppViewModel/AppViewModel.Properties.cs b/src/ViewModels/ViewModels.Uwp/Core/AppViewModel/AppViewModel.Properties.cs
@@ -6,9 +6,7 @@
 using Bili.Lib.Interfaces;
 using Bili.Models.App.Args;
 using Bili.Models.Data.Local;
-using Bili.Models.Data.Video;
 using Bili.Toolkit.Interfaces;
-using Bili.ViewModels.Uwp.Account;
 using Bili.ViewModels.Uwp.Article;
 using Bili.ViewModels.Uwp.Pgc;
 using Microsoft.Toolkit.Uwp.Connectivity;

diff --git a/...s/ViewModels.Uwp/Live/LivePartitionPageViewModel/LivePartitionPageViewModel.Properties.cs b/...s/ViewModels.Uwp/Live/LivePartitionPageViewModel/LivePartitionPageViewModel.Properties.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reactive;
 using Bili.Lib.Interfaces;

diff --git a/src/ViewModels/ViewModels.Uwp/Search/SearchFilterViewModel.cs b/src/ViewModels/ViewModels.Uwp/Search/SearchFilterViewModel.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Bili.Models.Data.Appearance;
-using Bili.Models.Enums;
 using ReactiveUI.Fody.Helpers;
 
 namespace Bili.ViewModels.Uwp.Search

diff --git a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
@@ -230,10 +230,10 @@
       <Version>18.2.5</Version>
     </PackageReference>
     <PackageReference Include="Splat">
-      <Version>14.3.1</Version>
+      <Version>14.3.4</Version>
     </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
-      <Version>1.1.33</Version>
+      <Version>1.1.69</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>