Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: dotnet/nbgv@master
id: nbgv
- name: Create GitHub release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
name: v${{ steps.nbgv.outputs.SemVer2 }}
tag_name: v${{ steps.nbgv.outputs.SemVer2 }}
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<Version>3.9.50</Version>
</PackageReference>
<PackageReference Include="SauceControl.InheritDoc" Version="2.0.2" PrivateAssets="all"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.201">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.203">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions PG.Benchmarks/PG.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.7" />
<PackageReference Include="System.Buffers" Version="4.6.1" />
<PackageReference Include="Testably.Abstractions.Testing" Version="6.0.0" />
<PackageReference Include="Testably.Abstractions.Testing" Version="6.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions PG.Commons/PG.Commons.Test/PG.Commons.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.1.0" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.2.2" />
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
<PackageReference Include="coverlet.msbuild" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions PG.Commons/PG.Commons/PG.Commons.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<ItemGroup>
<PackageReference Include="AnakinRaW.CommonUtilities" Version="13.0.18" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="13.0.18" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
<PackageReference Include="System.IO.Hashing" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.7" />
<PackageReference Include="System.IO.Hashing" Version="10.0.7" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.7" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageReference Include="Nullable" Version="1.3.1" Condition="$(TargetFramework) == 'netstandard2.0'">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
<EmbeddedResource Include="Resources\Files\Sorted_TwoEntries.dat" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.1.0" />
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
<PackageReference Include="Microsoft.Testing.Platform" Version="2.2.2" />
<PackageReference Include="coverlet.msbuild" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\PG.Commons\PG.Commons\PG.Commons.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
<None Remove="Resources\Files\v3n_2_files_data.meg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.2" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
<PackageReference Include="Microsoft.Testing.Platform" Version="2.2.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="coverlet.msbuild" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.7" />
<PackageReference Include="Required" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageReference Include="System.Collections.Immutable" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
<PackageReference Include="System.Collections.Immutable" Version="10.0.7" />
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<EmbeddedResource Include="Resources\Files\MT_COMMANDBAR.MTD" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.2" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
<PackageReference Include="Microsoft.Testing.Platform" Version="2.2.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="coverlet.msbuild" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -30,7 +30,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
<PackageReference Condition="$(TargetFramework) == 'netstandard2.0'" Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@

namespace PG.StarWarsGame.Files.Test;

public class HolderTest_MegAndDisposableModel : PetroglyphFileHolderTest<DisposableModel, MegTestParam, TestFileHolder<DisposableModel, MegTestParam>>
public class HolderTest_MegAndDisposableModel : PetroglyphFileHolderTest<DisposableModel, TestMegFileInfo, TestFileHolder<DisposableModel, TestMegFileInfo>>
{
protected override DisposableModel CreateModel()
{
return new DisposableModel();
}

protected override MegTestParam CreateFileInfo(string path, bool inMeg = false)
protected override TestMegFileInfo CreateFileInfo(string path, bool inMeg = false)
{
return new MegTestParam { FilePath = path, IsInsideMeg = inMeg};
return new TestMegFileInfo { FilePath = path, IsInsideMeg = inMeg};
}

protected override TestFileHolder<DisposableModel, MegTestParam> CreateFileHolder(DisposableModel model, MegTestParam fileInfo)
protected override TestFileHolder<DisposableModel, TestMegFileInfo> CreateFileHolder(DisposableModel model, TestMegFileInfo fileInfo)
{
return new TestFileHolder<DisposableModel, MegTestParam>(model, fileInfo, ServiceProvider);
return new TestFileHolder<DisposableModel, TestMegFileInfo>(model, fileInfo, ServiceProvider);
}

[Fact]
public void Ctor_ThrowsArgumentNullException()
{
var model = CreateModel();
var fileInfo = CreateFileInfo(DefaultFileName);
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<DisposableModel, MegTestParam>(model, fileInfo, null!));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<DisposableModel, MegTestParam>(model, null!, ServiceProvider));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<DisposableModel, MegTestParam>(null!, fileInfo, ServiceProvider));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<DisposableModel, TestMegFileInfo>(model, fileInfo, null!));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<DisposableModel, TestMegFileInfo>(model, null!, ServiceProvider));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<DisposableModel, TestMegFileInfo>(null!, fileInfo, ServiceProvider));
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@

namespace PG.StarWarsGame.Files.Test;

public class HolderTest_NonMegNonDisposableModel : PetroglyphFileHolderTest<object, TestParam, TestFileHolder<object, TestParam>>
public class HolderTest_NonMegNonDisposableModel : PetroglyphFileHolderTest<object, TestFileInfo, TestFileHolder<object, TestFileInfo>>
{
protected override object CreateModel()
{
return new DisposableModel();
}

protected override TestParam CreateFileInfo(string path, bool inMeg = false)
protected override TestFileInfo CreateFileInfo(string path, bool inMeg = false)
{
if (inMeg)
Assert.Fail();
return new TestParam { FilePath = path };
return new TestFileInfo { FilePath = path };
}

protected override TestFileHolder<object, TestParam> CreateFileHolder(object model, TestParam fileInfo)
protected override TestFileHolder<object, TestFileInfo> CreateFileHolder(object model, TestFileInfo fileInfo)
{
return new TestFileHolder<object, TestParam>(model, fileInfo, ServiceProvider);
return new TestFileHolder<object, TestFileInfo>(model, fileInfo, ServiceProvider);
}

[Fact]
public void Ctor_ThrowsArgumentNullException()
{
var model = CreateModel();
var fileInfo = CreateFileInfo(DefaultFileName);
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<object, TestParam>(model, fileInfo, null!));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<object, TestParam>(model, null!, ServiceProvider));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<object, TestParam>(null!, fileInfo, ServiceProvider));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<object, TestFileInfo>(model, fileInfo, null!));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<object, TestFileInfo>(model, null!, ServiceProvider));
Assert.Throws<ArgumentNullException>(() => new TestFileHolder<object, TestFileInfo>(null!, fileInfo, ServiceProvider));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.2" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.1.0" />
<PackageReference Include="Microsoft.Testing.Platform" Version="2.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
<PackageReference Include="coverlet.msbuild" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading
Loading