Skip to content

Commit a6cdf09

Browse files
NumpsyNumpsy
authored
PR #451: Minimize and update sample app package dependencies
1 parent 33cf8c4 commit a6cdf09

25 files changed

+38
-1388
lines changed

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_BZip2/Cmd_BZip2.csproj

+2-83
Original file line numberDiff line numberDiff line change
@@ -80,84 +80,10 @@ copy Cmd_BZip2.exe bunzip2.exe</PostBuildEvent>
8080
<FileAlignment>4096</FileAlignment>
8181
</PropertyGroup>
8282
<ItemGroup>
83-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
84-
<HintPath>..\..\packages\SharpZipLib.1.0.0-alpha1\lib\netstandard1.3\ICSharpCode.SharpZipLib.dll</HintPath>
85-
<Private>True</Private>
86-
</Reference>
87-
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<HintPath>..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
89-
<Private>True</Private>
83+
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
84+
<HintPath>..\..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
9085
</Reference>
9186
<Reference Include="System" />
92-
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
93-
<HintPath>..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
94-
<Private>True</Private>
95-
</Reference>
96-
<Reference Include="System.ComponentModel.Composition" />
97-
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
99-
<Private>True</Private>
100-
</Reference>
101-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
107-
<Private>True</Private>
108-
</Reference>
109-
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
111-
<Private>True</Private>
112-
</Reference>
113-
<Reference Include="System.IO.Compression.FileSystem" />
114-
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
115-
<HintPath>..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
116-
<Private>True</Private>
117-
</Reference>
118-
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
119-
<HintPath>..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
120-
<Private>True</Private>
121-
</Reference>
122-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
123-
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
124-
<Private>True</Private>
125-
</Reference>
126-
<Reference Include="System.Net.Http, Version=4.1.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
127-
<HintPath>..\..\packages\System.Net.Http.4.1.2\lib\net46\System.Net.Http.dll</HintPath>
128-
<Private>True</Private>
129-
</Reference>
130-
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
131-
<HintPath>..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
132-
<Private>True</Private>
133-
</Reference>
134-
<Reference Include="System.Numerics" />
135-
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136-
<HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
137-
<Private>True</Private>
138-
</Reference>
139-
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
140-
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
141-
<Private>True</Private>
142-
</Reference>
143-
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
144-
<HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
145-
<Private>True</Private>
146-
</Reference>
147-
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148-
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
149-
<Private>True</Private>
150-
</Reference>
151-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
152-
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
153-
<Private>True</Private>
154-
</Reference>
155-
<Reference Include="System.Xml" />
156-
<Reference Include="System.Xml.Linq" />
157-
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
158-
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
159-
<Private>True</Private>
160-
</Reference>
16187
</ItemGroup>
16288
<ItemGroup>
16389
<Compile Include="Cmd_BZip2.cs" />
@@ -178,11 +104,4 @@ copy Cmd_BZip2.exe bunzip2.exe</PostBuildEvent>
178104
<Content Include="readme.txt" />
179105
</ItemGroup>
180106
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
181-
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
182-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
183-
<PropertyGroup>
184-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
185-
</PropertyGroup>
186-
<Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
187-
</Target>
188107
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_BZip2/packages.config

+1-47
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
4-
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
5-
<package id="NETStandard.Library" version="2.0.0" targetFramework="net461" />
6-
<package id="SharpZipLib" version="1.0.0-alpha1" targetFramework="net461" />
7-
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
8-
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
9-
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
10-
<package id="System.Console" version="4.3.0" targetFramework="net461" />
11-
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
12-
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
13-
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
14-
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
15-
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
16-
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
17-
<package id="System.IO" version="4.3.0" targetFramework="net461" />
18-
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
19-
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
20-
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
21-
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
22-
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
23-
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
24-
<package id="System.Net.Http" version="4.1.2" targetFramework="net461" />
25-
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net461" />
26-
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
27-
<package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
28-
<package id="System.Reflection" version="4.3.0" targetFramework="net461" />
29-
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
30-
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
31-
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
32-
<package id="System.Runtime" version="4.3.0" targetFramework="net461" />
33-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
34-
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
35-
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
36-
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
37-
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
38-
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
39-
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
40-
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
41-
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
42-
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
43-
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
44-
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" />
45-
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
46-
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
47-
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
48-
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
49-
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
3+
<package id="SharpZipLib" version="1.2.0" targetFramework="net461" />
504
</packages>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_Checksum/Cmd_Checksum.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,23 @@ public static int Main(string[] args)
132132
case Command.Crc32:
133133
var currentCrc = new Crc32();
134134
while ((bytesRead = checksumStream.Read(buffer, 0, buffer.Length)) > 0) {
135-
currentCrc.Update(buffer, 0, bytesRead);
135+
currentCrc.Update(new ArraySegment<byte>(buffer, 0, bytesRead));
136136
}
137137
Console.WriteLine("CRC32 for {0} is 0x{1:X8}", args[0], currentCrc.Value);
138138
break;
139139

140140
case Command.BZip2:
141141
var currentBZip2Crc = new BZip2Crc();
142142
while ((bytesRead = checksumStream.Read(buffer, 0, buffer.Length)) > 0) {
143-
currentBZip2Crc.Update(buffer, 0, bytesRead);
143+
currentBZip2Crc.Update(new ArraySegment<byte>(buffer, 0, bytesRead));
144144
}
145145
Console.WriteLine("BZip2CRC32 for {0} is 0x{1:X8}", args[0], currentBZip2Crc.Value);
146146
break;
147147

148148
case Command.Adler:
149149
var currentAdler = new Adler32();
150150
while ((bytesRead = checksumStream.Read(buffer, 0, buffer.Length)) > 0) {
151-
currentAdler.Update(buffer, 0, bytesRead);
151+
currentAdler.Update(new ArraySegment<byte>(buffer, 0, bytesRead));
152152
}
153153
Console.WriteLine("Adler32 for {0} is 0x{1:X8}", args[0], currentAdler.Value);
154154
break;

0 commit comments

Comments
 (0)