Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more target frameworks for tests

Browse Source
This commit is contained in:
Caelan Sayler
2023-12-23 11:10:42 +00:00
parent a072ee6757
commit a21656bb6a
5 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/Directory.Build.props
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project> <Project>
<PropertyGroup> <PropertyGroup Condition=" $(MSBuildProjectName.EndsWith('Tests')) ">
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<IsTest>true</IsTest> <IsTest>true</IsTest>
@@ -9,13 +9,21 @@
<AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<!-- Coverage -->
<CoverletOutputFormat>json,opencover</CoverletOutputFormat>
<CoverletOutput>..\</CoverletOutput>
<MergeWith>..\coverage.json</MergeWith>
<Include>[Squirrel*]*</Include>
<Exclude>[Squirrel.*.Tests]*</Exclude>
<CollectCoverage>true</CollectCoverage>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup Condition=" $(MSBuildProjectName.EndsWith('Tests')) ">
<Compile Include="..\GlobalUsings.cs" Link="GlobalUsings.cs" /> <Compile Include="..\GlobalUsings.cs" Link="GlobalUsings.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup Condition=" $(MSBuildProjectName.EndsWith('Tests')) ">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="xunit" Version="2.6.3" /> <PackageReference Include="xunit" Version="2.6.3" />
@@ -28,13 +36,4 @@
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup>
<CoverletOutputFormat>json,opencover</CoverletOutputFormat>
<CoverletOutput>..\</CoverletOutput>
<MergeWith>..\coverage.json</MergeWith>
<Include>[Squirrel*]*</Include>
<Exclude>[Squirrel.*.Tests]*</Exclude>
<CollectCoverage>true</CollectCoverage>
</PropertyGroup>
</Project> </Project>

2
test/Squirrel.CommandLine.Tests/Squirrel.CommandLine.Tests.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>

2
test/Squirrel.Packaging.Tests/Squirrel.Packaging.Tests.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

10
test/Squirrel.Tests/Squirrel.Tests.csproj
View File

@@ -2,13 +2,21 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFrameworks>net462;net48;net6.0;net8.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.IO.Packaging" Version="8.0.0" /> <PackageReference Include="System.IO.Packaging" Version="8.0.0" />
</ItemGroup> </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" />
<PackageReference Include="StrongNamer" Version="0.2.5" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Squirrel\Squirrel.csproj" /> <ProjectReference Include="..\..\src\Squirrel\Squirrel.csproj" />
</ItemGroup> </ItemGroup>

6
test/Squirrel.Tests/TestHelpers/FakeFixtureRepository.cs
View File

@@ -19,9 +19,9 @@ namespace Squirrel.Tests.TestHelpers
.ToList(); .ToList();
if (mockLatestFullVer) { if (mockLatestFullVer) {
var minFullVer = releases.Where(r => !r.IsDelta).MinBy(r => r.Version); var minFullVer = releases.Where(r => !r.IsDelta).OrderBy(r => r.Version).First();
var maxfullVer = releases.Where(r => !r.IsDelta).MaxBy(r => r.Version).Single(); var maxfullVer = releases.Where(r => !r.IsDelta).OrderByDescending(r => r.Version).First();
var maxDeltaVer = releases.Where(r => r.IsDelta).MaxBy(r => r.Version).Single(); var maxDeltaVer = releases.Where(r => r.IsDelta).OrderByDescending(r => r.Version).First();
// our fixtures don't have a full package for the latest version, we expect the tests to generate this file // our fixtures don't have a full package for the latest version, we expect the tests to generate this file
if (maxfullVer.Version < maxDeltaVer.Version) { if (maxfullVer.Version < maxDeltaVer.Version) {