Skip to content

Commit d63aa1f

Browse files
authored
Use published version of multiextractor (#226)
* Switch to using official published multiextractor * Remove unused sharpcompress dependency. * Remove Fork of multiextractor
1 parent a66f774 commit d63aa1f

File tree

10 files changed

+3
-2191
lines changed

10 files changed

+3
-2191
lines changed

AppInspector.sln

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppInspector.RulesEngine", "RulesEngine\AppInspector.RulesEngine.csproj", "{C19A98D2-629D-4F4D-87E4-3154416970BA}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiExtractor", "MultiExtractor\MultiExtractor.csproj", "{7C07A2A2-508E-4BBE-873F-F60F9FB4A9D9}"
17-
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppInspector.CLI", "AppInspector.CLI\AppInspector.CLI.csproj", "{824ED27E-A4CF-46A6-A01F-98B0821EB61C}"
1917
EndProject
2018
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RulesPacker", "RulesPacker", "{C464D0CE-5254-4EA5-87C9-C0C96E40C3CB}"
@@ -39,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RulesPacker", "RulesPacker"
3937
EndProject
4038
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest.Commands", "UnitTest.Commands\UnitTest.Commands.csproj", "{181BD826-A428-41D9-8BEC-0D8EB2288DF5}"
4139
EndProject
42-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{F031887C-EA60-4390-9940-765E99E69B8F}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{F031887C-EA60-4390-9940-765E99E69B8F}"
4341
EndProject
4442
Global
4543
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -55,10 +53,6 @@ Global
5553
{C19A98D2-629D-4F4D-87E4-3154416970BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
5654
{C19A98D2-629D-4F4D-87E4-3154416970BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
5755
{C19A98D2-629D-4F4D-87E4-3154416970BA}.Release|Any CPU.Build.0 = Release|Any CPU
58-
{7C07A2A2-508E-4BBE-873F-F60F9FB4A9D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59-
{7C07A2A2-508E-4BBE-873F-F60F9FB4A9D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{7C07A2A2-508E-4BBE-873F-F60F9FB4A9D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
61-
{7C07A2A2-508E-4BBE-873F-F60F9FB4A9D9}.Release|Any CPU.Build.0 = Release|Any CPU
6256
{824ED27E-A4CF-46A6-A01F-98B0821EB61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6357
{824ED27E-A4CF-46A6-A01F-98B0821EB61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
6458
{824ED27E-A4CF-46A6-A01F-98B0821EB61C}.Release|Any CPU.ActiveCfg = Release|Any CPU

AppInspector/AppInspector.Commands.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@
5656
<ItemGroup>
5757
<PackageReference Include="CommandLineParser" Version="2.7.82" />
5858
<PackageReference Include="DotLiquid" Version="2.0.325" />
59+
<PackageReference Include="Microsoft.CST.MultiExtractor" Version="0.1.188" />
5960
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
6061
<PackageReference Include="NLog" Version="4.7.0" />
61-
<PackageReference Include="sharpcompress" Version="0.25.0" />
62-
<PackageReference Include="SharpZipLib" Version="1.2.0" />
6362
</ItemGroup>
6463

6564
<ItemGroup>
@@ -78,10 +77,6 @@
7877
</ItemGroup>
7978

8079
<ItemGroup>
81-
<ProjectReference Include="..\MultiExtractor\MultiExtractor.csproj">
82-
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
83-
<IncludeAssets>MultiExtractor.dll</IncludeAssets>
84-
</ProjectReference>
8580

8681
<ProjectReference Include="..\RulesEngine\AppInspector.RulesEngine.csproj">
8782
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>

AppInspector/Commands/AnalyzeCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
using Microsoft.ApplicationInspector.RulesEngine;
5-
using MultiExtractor;
5+
using Microsoft.CST.OpenSource.MultiExtractor;
66
using Newtonsoft.Json;
77
using NLog;
88
using System;

MultiExtractor/ArFile.cs

Lines changed: 0 additions & 302 deletions
This file was deleted.

0 commit comments

Comments
 (0)