Refactor projects & add NSwag codegen

This commit is contained in:
Caelan Sayler
2024-12-24 14:36:26 +00:00
committed by Caelan
parent 2d6d155444
commit 6eb35b8a81
90 changed files with 6267 additions and 702 deletions

View File

@@ -1,4 +1,5 @@
using Neovolve.Logging.Xunit;
using Velopack.Core;
using Velopack.Packaging.Exceptions;
using Velopack.Packaging.Windows;
using Velopack.Util;

View File

@@ -1,6 +1,7 @@
using Velopack.Deployment;
using Velopack.Sources;
using Octokit;
using Velopack.Core;
using Velopack.Packaging.Exceptions;
using Velopack.Util;

View File

@@ -5,6 +5,7 @@ using System.Xml.Linq;
using Microsoft.Win32;
using NuGet.Packaging;
using Velopack.Compression;
using Velopack.Core;
using Velopack.Packaging.Commands;
using Velopack.Packaging.Exceptions;
using Velopack.Packaging.Windows.Commands;

View File

@@ -1,7 +1,7 @@
#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning disable CS0612 // Type or member is obsolete
using System.Text;
using Velopack.Packaging;
using Velopack.Core;
using Velopack.Sources;
using Velopack.Util;
@@ -39,13 +39,14 @@ internal class FakeFixtureRepository : Sources.IFileDownloader
var name = new ReleaseEntryName(maxfullVer.PackageId, maxDeltaVer.Version, false);
releases.Add(new ReleaseEntry("0000000000000000000000000000000000000000", name.ToFileName(), maxfullVer.Filesize));
releasesNew.Add(new VelopackAsset {
PackageId = maxfullVer.PackageId,
Version = maxDeltaVer.Version,
Type = VelopackAssetType.Full,
FileName = $"{maxfullVer.PackageId}-{maxDeltaVer.Version}-full.nupkg",
Size = maxfullVer.Filesize,
});
releasesNew.Add(
new VelopackAsset {
PackageId = maxfullVer.PackageId,
Version = maxDeltaVer.Version,
Type = VelopackAssetType.Full,
FileName = $"{maxfullVer.PackageId}-{maxDeltaVer.Version}-full.nupkg",
Size = maxfullVer.Filesize,
});
}
}
@@ -80,7 +81,8 @@ internal class FakeFixtureRepository : Sources.IFileDownloader
return Task.FromResult(File.ReadAllBytes(filePath));
}
public Task DownloadFile(string url, string targetFile, Action<int> progress, string authorization = null, string accept = null, double timeout = 30, CancellationToken token = default)
public Task DownloadFile(string url, string targetFile, Action<int> progress, string authorization = null, string accept = null, double timeout = 30,
CancellationToken token = default)
{
var rel = _releases.FirstOrDefault(r => url.EndsWith(r.OriginalFilename));
var filePath = PathHelper.GetFixture(rel.OriginalFilename);
@@ -111,4 +113,4 @@ internal class FakeFixtureRepository : Sources.IFileDownloader
throw new NotSupportedException("FakeFixtureRepository doesn't have: " + url);
}
}
}

View File

@@ -1,7 +1,7 @@
using System.Text;
using NuGet.Versioning;
using Velopack.Compression;
using Velopack.Packaging;
using Velopack.Core;
using Velopack.Locators;
using Velopack.Sources;
using Velopack.Tests.TestHelpers;

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
@@ -19,29 +19,29 @@
</Choose>
<ItemGroup>
<Compile Include="..\..\src\vpk\Velopack.Packaging\SimpleJson.cs" Link="SimpleJson.cs" />
<Compile Include="..\..\src\vpk\Velopack.Core\SimpleJson.cs" Link="SimpleJson.cs"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.IO.Packaging" Version="9.0.0" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0"/>
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Reference Include="System.Web" />
<Reference Include="System.Net.Http" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Web"/>
<Reference Include="System.Net.Http"/>
<Reference Include="System.IO.Compression"/>
<Reference Include="System.IO.Compression.FileSystem"/>
</ItemGroup>
<Choose>
<When Condition="'$(TargetFramework)' == 'net6.0'">
<ItemGroup>
<ProjectReference Include="..\..\src\lib-csharp\Velopack.csproj" SetTargetFramework="TargetFramework=netstandard2.0" />
<ProjectReference Include="..\..\src\lib-csharp\Velopack.csproj" SetTargetFramework="TargetFramework=netstandard2.0"/>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<ProjectReference Include="..\..\src\lib-csharp\Velopack.csproj" />
<ProjectReference Include="..\..\src\lib-csharp\Velopack.csproj"/>
</ItemGroup>
</Otherwise>
</Choose>