change: use PureSharpCompress instead

lemutec · Nov 24, 2024 · c04d3bc · c04d3bc
1 parent 6d4b040
commit c04d3bc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/build/MicaSetup.Tools/MakeMica.Cli/App.cs b/build/MicaSetup.Tools/MakeMica.Cli/App.cs
@@ -1,7 +1,7 @@
 using MakeMica.Cli.Core;
 using MakeMica.Cli.Helper;
 using MakeMica.Shared;
-using SharpCompress.Common;
+using PureSharpCompress.Common;
 
 namespace MakeMica.Cli;
 

diff --git a/build/MicaSetup.Tools/MakeMica.Cli/Helper/ArchiveFileHelper.cs b/build/MicaSetup.Tools/MakeMica.Cli/Helper/ArchiveFileHelper.cs
@@ -1,9 +1,9 @@
-using SharpCompress.Archives.GZip;
-using SharpCompress.Archives.Rar;
-using SharpCompress.Archives.SevenZip;
-using SharpCompress.Archives.Zip;
-using SharpCompress.Common;
-using SharpCompress.Readers;
+using PureSharpCompress.Archives.GZip;
+using PureSharpCompress.Archives.Rar;
+using PureSharpCompress.Archives.SevenZip;
+using PureSharpCompress.Archives.Zip;
+using PureSharpCompress.Common;
+using PureSharpCompress.Readers;
 
 namespace MakeMica.Cli.Helper;
 

diff --git a/build/MicaSetup.Tools/MakeMica.Cli/MakeMica.Cli.csproj b/build/MicaSetup.Tools/MakeMica.Cli/MakeMica.Cli.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="UTF.Unknown" Version="2.5.1" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="SharpCompress" Version="0.33.0" />
+		<PackageReference Include="PureSharpCompress" Version="0.38.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/build/MicaSetup/Helper/Setup/ArchiveFileHelper.cs b/build/MicaSetup/Helper/Setup/ArchiveFileHelper.cs
@@ -44,7 +44,7 @@ void ProgressCallback(double progress)
         {
             if (currentProgress != progress || currentKey != reader.Entry.Key)
             {
-                progressCallback?.Invoke(currentProgress = progress, currentKey = reader.Entry.Key);
+                progressCallback?.Invoke(currentProgress = progress, currentKey = reader.Entry.Key!);
             }
         }
 

diff --git a/build/MicaSetup/Helper/Setup/InstallHelper.cs b/build/MicaSetup/Helper/Setup/InstallHelper.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace MicaSetup.Helper.Helper;
 

diff --git a/build/MicaSetup/MicaSetup.Uninst.csproj b/build/MicaSetup/MicaSetup.Uninst.csproj
@@ -19,7 +19,7 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<AnalysisLevel>6.0-recommended</AnalysisLevel>
-		<SignAssembly>True</SignAssembly>
+		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>app.snk</AssemblyOriginatorKeyFile>
 		<DefineConstants>$(DefineConstants);UNINST</DefineConstants>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -78,10 +78,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Costura.Fody" Version="5.7.0" Condition=" '$(Configuration)' == 'Release'">
+		<PackageReference Include="Costura.Fody" Version="5.7.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+		<PackageReference Include="PureSharpCompress" Version="0.38.0"  Condition="'$(Configuration)' == 'Debug'"/>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/build/MicaSetup/MicaSetup.csproj b/build/MicaSetup/MicaSetup.csproj
@@ -19,7 +19,7 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<AnalysisLevel>6.0-recommended</AnalysisLevel>
-		<SignAssembly>True</SignAssembly>
+		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>app.snk</AssemblyOriginatorKeyFile>
 		<DefineConstants>$(DefineConstants);SETUP</DefineConstants>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -81,12 +81,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<!--<PackageReference Include="Costura.Fody" Version="5.7.0" Condition="'$(Configuration)' == 'Release'">-->
 		<PackageReference Include="Costura.Fody" Version="5.7.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="PureSharpCompress" Version="0.38.0-rc3" />
+		<PackageReference Include="PureSharpCompress" Version="0.38.0" />
 	</ItemGroup>
 
 	<ItemGroup>