Skip to content

Commit 0c53577

Browse files
committed
signing both test and src project to allow internal visiblity from test to src, upgraded dependencies and target framework of test project
1 parent 6cea3c4 commit 0c53577

File tree

7 files changed

+11
-27
lines changed

7 files changed

+11
-27
lines changed

src/AngleSharp.Diffing.Tests/AngleSharp.DiffingTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<AssemblyName>AngleSharp.Diffing.Tests</AssemblyName>
77
<RootNamespace>AngleSharp.Diffing</RootNamespace>
@@ -11,13 +11,13 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1313
<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
14-
<PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
14+
<PackageReference Include="Shouldly" Version="4.0.3" />
1515
<PackageReference Include="xunit" Version="2.4.1" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="1.1.0">
20+
<PackageReference Include="coverlet.collector" Version="3.0.3">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>

src/AngleSharp.Diffing.Tests/ShouldlyTestExtensions.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,7 @@
77
namespace AngleSharp.Diffing
88
{
99
public static class ShouldlyTestExtensions
10-
{
11-
// The ShouldSatisfyAllConditions are here until https://github.com/shouldly/shouldly/issues/472 lands in a release of Shouldly.
12-
public static void ShouldSatisfyAllConditions<T>(this T actual, params Action<T>[] conditions) => ShouldSatisfyAllConditions(actual, () => null, conditions);
13-
public static void ShouldSatisfyAllConditions<T>(this T actual, string customMessage, params Action<T>[] conditions) => ShouldSatisfyAllConditions(actual, () => customMessage, conditions);
14-
public static void ShouldSatisfyAllConditions<T>(this T actual, Func<string?> customMessage, params Action<T>[] conditions)
15-
{
16-
var convertedConditions = conditions
17-
.Select(a => new Action(() => a(actual)))
18-
.ToArray();
19-
20-
actual.ShouldSatisfyAllConditions(customMessage, convertedConditions);
21-
}
22-
10+
{
2311
public static void ShouldAllBe<T>(this IEnumerable<T> actual, Func<T, int, bool> elementPredicate)
2412
{
2513
actual.Select(elementPredicate).ShouldAllBe(x => x);

src/AngleSharp.Diffing/AngleSharp.Diffing.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
<SignAssembly>true</SignAssembly>
7-
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
86
</PropertyGroup>
97

108
<PropertyGroup>
@@ -17,7 +15,7 @@
1715
<PackageIcon>logo.png</PackageIcon>
1816
<PackageIconUrl>https://raw.github.com/AngleSharp/AngleSharp.Diffing/master/logo.png</PackageIconUrl>
1917
<PackageTags>html html5 css css3 dom library diffing anglesharp diff difference compare comparison testing</PackageTags>
20-
<Copyright>Copyright 2019-2021, Egil Hansen</Copyright>
18+
<Copyright>Egil Hansen</Copyright>
2119
<RepositoryUrl>https://github.com/AngleSharp/AngleSharp.Diffing</RepositoryUrl>
2220
<RepositoryType>git</RepositoryType>
2321
<PublishRepositoryUrl>true</PublishRepositoryUrl>

src/AngleSharp.Diffing/Assembly.cs

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
using System.Runtime.CompilerServices;
2+
[assembly: InternalsVisibleTo("AngleSharp.Diffing.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010001adf274fa2b375134e8e4558d606f1a0f96f5cd0c6b99970f7cce9887477209d7c29f814e2508d8bd2526e99e8cd273bd1158a3984f1ea74830ec5329a77c6ff201a15edeb8b36ab046abd1bce211fe8dbb076d7d806f46b15bfda44def04ead0669971e96c5f666c9eda677f28824fff7aa90d32929ed91d529a7a41699893")]

src/Directory.Build.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
<LangVersion>8.0</LangVersion>
88
<Nullable>enable</Nullable>
99
<WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
10+
<SignAssembly>true</SignAssembly>
11+
<AssemblyOriginatorKeyFile>../Key.snk</AssemblyOriginatorKeyFile>
1012
</PropertyGroup>
1113

1214
<ItemGroup>
1315
<PackageReference Include="AngleSharp" Version="0.14.0" />
1416
<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
15-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
1917
</ItemGroup>
2018
</Project>
File renamed without changes.

0 commit comments

Comments
 (0)