tiiiny bit of codeQA

CollapseLauncher · Sep 29, 2024 · ab1cd03 · ab1cd03
1 parent 6a1df2d
commit ab1cd03
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 50 deletions.
diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
@@ -125,7 +125,6 @@
         <PackageReference Include="SharpHDiffPatch.Core" Version="2.2.7" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
         <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
-        <PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-rc.1.24431.7" />
         <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
         <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.0-rc.1.24431.7" />
         <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.1.24431.7" />

diff --git a/CollapseLauncher/XAMLs/MainApp/MainPage.xaml b/CollapseLauncher/XAMLs/MainApp/MainPage.xaml
@@ -7,7 +7,6 @@
       xmlns:extension="using:CollapseLauncher.Extension"
       xmlns:helper="using:Hi3Helper"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:p="using:CollapseLauncher.Helper.Metadata"
       Unloaded="Page_Unloaded"
       mc:Ignorable="d">
     <Page.Resources>

diff --git a/CollapseLauncher/XAMLs/MainApp/MainPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/MainPage.xaml.cs
@@ -20,7 +20,6 @@
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Animation;

diff --git a/CollapseLauncher/XAMLs/Theme/NavigationView_ThemeResource.xaml b/CollapseLauncher/XAMLs/Theme/NavigationView_ThemeResource.xaml
@@ -3,7 +3,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
                     xmlns:controls="using:Microsoft.UI.Xaml.Controls"
-                    xmlns:media="using:Microsoft.UI.Xaml.Media"
                     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">

diff --git a/CollapseLauncher/packages.lock.json b/CollapseLauncher/packages.lock.json
@@ -230,12 +230,6 @@
           "System.CommandLine": "2.0.0-beta4.22272.1"
         }
       },
-      "System.Diagnostics.EventLog": {
-        "type": "Direct",
-        "requested": "[9.0.0-rc.1.24431.7, )",
-        "resolved": "9.0.0-rc.1.24431.7",
-        "contentHash": "ARI0u0Z1/eVTCeb6G4oS/xdTX0xvHPuIoT1IAHsRlOYzgzgmoXZxzH28AMD8etSCDXCBT+0icbcHMsNjOQlxDg=="
-      },
       "System.Security.AccessControl": {
         "type": "Direct",
         "requested": "[6.0.1, )",
@@ -407,7 +401,6 @@
         "type": "Project",
         "dependencies": {
           "Hi3Helper.EncTool": "[1.0.0, )",
-          "Hi3Helper.Http": "[2.0.0, )",
           "Microsoft.Windows.CsWinRT": "[2.1.3, )"
         }
       },
@@ -515,12 +508,6 @@
           "PhotoSauce.MagicScaler": "[0.14.2]"
         }
       },
-      "System.Diagnostics.EventLog": {
-        "type": "Direct",
-        "requested": "[9.0.0-rc.1.24431.7, )",
-        "resolved": "9.0.0-rc.1.24431.7",
-        "contentHash": "ARI0u0Z1/eVTCeb6G4oS/xdTX0xvHPuIoT1IAHsRlOYzgzgmoXZxzH28AMD8etSCDXCBT+0icbcHMsNjOQlxDg=="
-      },
       "System.Security.AccessControl": {
         "type": "Direct",
         "requested": "[6.0.1, )",

diff --git a/Hi3Helper.CommunityToolkit/ImageCropper/Themes/Generic.xaml b/Hi3Helper.CommunityToolkit/ImageCropper/Themes/Generic.xaml
@@ -1,7 +1,6 @@
-<!-- ReSharper disable Xaml.PathError -->
+<!--  ReSharper disable Xaml.PathError  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Hi3Helper.CommunityToolkit.WinUI.Controls">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper/ImageCropper.xaml" />

diff --git a/Hi3Helper.Core/Hi3Helper.Core.csproj b/Hi3Helper.Core/Hi3Helper.Core.csproj
@@ -51,7 +51,6 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\Hi3Helper.EncTool\Hi3Helper.EncTool.csproj" />
-		<ProjectReference Include="..\Hi3Helper.Http\Hi3Helper.Http.csproj" />
 	</ItemGroup>
 
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">

diff --git a/Hi3Helper.EncTool.Test/Hi3Helper.EncTool.Test.csproj b/Hi3Helper.EncTool.Test/Hi3Helper.EncTool.Test.csproj
@@ -9,9 +9,4 @@
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Hi3Helper.EncTool\Hi3Helper.EncTool.csproj" />
-    <ProjectReference Include="..\Hi3Helper.Http\Hi3Helper.Http.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/Hi3Helper.EncTool.Test/Program.cs b/Hi3Helper.EncTool.Test/Program.cs
@@ -1,5 +1,4 @@
-using Hi3Helper.EncTool.Parser.AssetMetadata;
-using System.IO.Compression;
+using System.IO.Compression;
 
 namespace Hi3Helper.EncTool.Test
 {

diff --git a/Hi3Helper.EncTool.Test/packages.lock.json b/Hi3Helper.EncTool.Test/packages.lock.json
@@ -7,27 +7,6 @@
         "requested": "[9.0.0-rc.1.24431.7, )",
         "resolved": "9.0.0-rc.1.24431.7",
         "contentHash": "B8jHIIszeUdDY+O4G1/xPOuhrriwsv9Z8/u3XSOAqc8Z0mQCeLBKg2oLGElDZeRF8wWXDGklAKY3f0IHopyXkQ=="
-      },
-      "Google.Protobuf": {
-        "type": "Transitive",
-        "resolved": "3.28.2",
-        "contentHash": "Z86ZKAB+v1B/m0LTM+EVamvZlYw/g3VND3/Gs4M/+aDIxa2JE9YPKjDxTpf0gv2sh26hrve3eI03brxBmzn92g=="
-      },
-      "System.IO.Hashing": {
-        "type": "Transitive",
-        "resolved": "9.0.0-rc.1.24431.7",
-        "contentHash": "giMiDNlne8WcLG7rsEfrETaukDUTBPn8a97QRo9LYR71O0Rb4SJ6TbfGdQ9oiBYldVPSAbSQANb5ThLZOo408Q=="
-      },
-      "hi3helper.enctool": {
-        "type": "Project",
-        "dependencies": {
-          "Google.Protobuf": "[3.28.2, )",
-          "Hi3Helper.Http": "[2.0.0, )",
-          "System.IO.Hashing": "[9.0.0-rc.1.24431.7, )"
-        }
-      },
-      "hi3helper.http": {
-        "type": "Project"
       }
     }
   }

diff --git a/Hi3Helper.Http b/Hi3Helper.Http
diff --git a/Hi3Helper.TaskScheduler/packages.lock.json b/Hi3Helper.TaskScheduler/packages.lock.json
@@ -18,6 +18,15 @@
         "resolved": "6.8.2",
         "contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3"
+        }
+      },
       "System.Net.Http": {
         "type": "Direct",
         "requested": "[4.3.4, )",
@@ -60,6 +69,11 @@
         "resolved": "1.1.0",
         "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net462": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ=="
+      },
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",

diff --git a/qodana.yaml b/qodana.yaml
@@ -16,6 +16,8 @@ exclude:
   - name: Xaml.ConstructorWarning
   - name: Xaml.InvalidResourceType
   - name: Xaml.StaticResourceNotResolved
+  - name: RedundantExtendsListEntry
+  - name: PartialTypeWithSinglePart
 include:
   - name: CheckDependencyLicenses
 licenseRules: