Update nuget packages; remove submodule

This commit is contained in:
Caelan Sayler
2021-08-11 23:02:47 +01:00
parent 03fa302e25
commit 655edeeb26
6 changed files with 12 additions and 20 deletions

4
.gitmodules vendored
View File

@@ -1,4 +0,0 @@
[submodule "vendor/nuget"]
path = vendor/nuget
url = https://github.com/paulcbetts/NuGet
branch = fix-prerelease-comparison

View File

@@ -16,8 +16,8 @@
</PropertyGroup>
<ItemGroup Condition=" '$(MSBuildProjectExtension)'=='.csproj' ">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231" PrivateAssets="All" />
</ItemGroup>
<PropertyGroup Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' ">

View File

@@ -13,16 +13,13 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ILRepack" Version="1.26.0" />
<PackageReference Include="ILRepack" Version="2.0.18" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Web.Xdt" Version="3.1.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Federation" Version="4.8.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.2.237901">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Data.Services.Client" Version="5.8.4" />
</ItemGroup>
</Project>

View File

@@ -113,7 +113,7 @@ namespace Squirrel.Bsdiff
int eblen = 0;
using (WrappingStream wrappingStream = new WrappingStream(output, Ownership.None))
using (var bz2Stream = new BZip2Stream(wrappingStream, CompressionMode.Compress))
using (var bz2Stream = new BZip2Stream(wrappingStream, CompressionMode.Compress, true))
{
// compute the differences, writing ctrl as we go
int scan = 0;
@@ -231,7 +231,7 @@ namespace Squirrel.Bsdiff
// write compressed diff data
using (WrappingStream wrappingStream = new WrappingStream(output, Ownership.None))
using (var bz2Stream = new BZip2Stream(wrappingStream, CompressionMode.Compress))
using (var bz2Stream = new BZip2Stream(wrappingStream, CompressionMode.Compress, true))
{
bz2Stream.Write(db, 0, dblen);
}
@@ -242,7 +242,7 @@ namespace Squirrel.Bsdiff
// write compressed extra data
using (WrappingStream wrappingStream = new WrappingStream(output, Ownership.None))
using (var bz2Stream = new BZip2Stream(wrappingStream, CompressionMode.Compress))
using (var bz2Stream = new BZip2Stream(wrappingStream, CompressionMode.Compress, true))
{
bz2Stream.Write(eb, 0, eblen);
}
@@ -327,9 +327,9 @@ namespace Squirrel.Bsdiff
compressedExtraStream.Seek(c_headerSize + controlLength + diffLength, SeekOrigin.Current);
// decompress each part (to read it)
using (var controlStream = new BZip2Stream(compressedControlStream, CompressionMode.Decompress))
using (var diffStream = new BZip2Stream(compressedDiffStream, CompressionMode.Decompress))
using (var extraStream = new BZip2Stream(compressedExtraStream, CompressionMode.Decompress))
using (var controlStream = new BZip2Stream(compressedControlStream, CompressionMode.Decompress, true))
using (var diffStream = new BZip2Stream(compressedDiffStream, CompressionMode.Decompress, true))
using (var extraStream = new BZip2Stream(compressedExtraStream, CompressionMode.Decompress, true))
{
long[] control = new long[3];
byte[] buffer = new byte[8];

View File

@@ -9,9 +9,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DeltaCompressionDotNet" Version="1.1.0.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="SharpCompress" Version="0.17.1.0" />
<PackageReference Include="DeltaCompressionDotNet" Version="2.0.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
<PackageReference Include="SharpCompress" Version="0.28.3" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>

1
vendor/nuget vendored

Submodule vendor/nuget deleted from 50f8d9e438