Skip to content

Commit

Permalink
Merge pull request #157 from nils-a/release/1.0.4
Browse files Browse the repository at this point in the history
Release/1.0.4
  • Loading branch information
nils-a authored Sep 25, 2021
2 parents ff5e93a + 4072964 commit 9a6c3c1
Show file tree
Hide file tree
Showing 80 changed files with 505 additions and 534 deletions.
18 changes: 0 additions & 18 deletions .github/dependabot.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [ "github>nils-a/renovate-config" ],
"packageRules": [
{
"matchPackageNames": ["cake.tool", "Cake.Core"],
"enabled": false
}
]
}
13 changes: 13 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
branches: [develop]
schedule:
- cron: '0 15 * * 6'
workflow_dispatch:

jobs:
analyze:
Expand Down Expand Up @@ -57,6 +58,18 @@ jobs:
target: DotNetCore-Build
cake-version: 0.38.5
cake-bootstrap: true
env:
COMPlus_DbgEnableMiniDump: 1
COMPlus_DbgMiniDumpType: 1
COMPlus_DbgMiniDumpName: BuildArtifacts/coredump.dmp

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

- name: Upload CoreDump
uses: actions/upload-artifact@v2
if: failure()
with:
if-no-files-found: warn
name: CoreDump
path: BuildArtifacts/coredump.dmp
13 changes: 0 additions & 13 deletions .github/workflows/dependabot-cake.yml

This file was deleted.

2 changes: 1 addition & 1 deletion demo/frosting/build/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RunWorkingDirectory>$(MSBuildProjectDirectory)..</RunWorkingDirectory>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="1.0.0" />
<PackageReference Include="Cake.Frosting" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cake.7zip, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null">
Expand Down
2 changes: 1 addition & 1 deletion src/.idea/.idea.Cake.7zip/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions src/.idea/.idea.Cake.7zip/.idea/riderModule.iml

This file was deleted.

19 changes: 9 additions & 10 deletions src/Cake.7zip.Tests/Cake.7zip.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="1.1.0" />
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
<PackageReference Include="Cake.Testing" Version="1.2.0" />
<PackageReference Include="coverlet.msbuild" Version="3.1.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Text.Analyzers" Version="2.6.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
Expand All @@ -39,4 +38,4 @@
<ItemGroup>
<ProjectReference Include="..\Cake.7zip\Cake.7zip.csproj" />
</ItemGroup>
</Project>
</Project>
10 changes: 5 additions & 5 deletions src/Cake.7zip.Tests/Commands/AbstractOutputCommandTests.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Cake.SevenZip.Commands;
using Cake.SevenZip.Parsers;

using FluentAssertions;

using Moq;

using Shouldly;

using Xunit;

namespace Cake.SevenZip.Tests.Commands
Expand All @@ -24,7 +24,7 @@ public void AbstractOutputCommand_sets_raw_output()

((ICanParseOutput)partialMock).SetRawOutput(expected);

actual.Should().BeEquivalentTo(expected);
actual.ShouldBeEquivalentTo(expected);
}

[Fact]
Expand All @@ -39,7 +39,7 @@ public void AbstractOutputCommand_sets_nothing_when_called_with_null()

((ICanParseOutput)partialMock).SetRawOutput(null);

actual.Should().BeNull();
actual.ShouldBeNull();
}

[Fact]
Expand All @@ -56,7 +56,7 @@ public void AbstractOutputCommand_uses_parser_to_set_non_raw_output()

((ICanParseOutput)partialMock).SetRawOutput(new string[] { });

actual.Should().Be(expected.Object);
actual.ShouldBe(expected.Object);
}
}
}
6 changes: 3 additions & 3 deletions src/Cake.7zip.Tests/Commands/BenchmarkCommandTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Cake.SevenZip.Commands;
using Cake.SevenZip.Parsers;

using FluentAssertions;
using Shouldly;

using Xunit;

Expand All @@ -19,8 +19,8 @@ public void OutputCommand_uses_its_own_parser<T>(BaseOutputCommand<T> command, T
where T : IOutput
{
var actual = command.OutputParser;
actual.Should().NotBeNull();
actual.Should().BeOfType(expectedParserType);
actual.ShouldNotBeNull();
actual.ShouldBeOfType(expectedParserType);
}

private class TestData : IEnumerable<object[]>
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.7zip.Tests/Commands/CommandExtensionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using Cake.SevenZip.Commands;

using FluentAssertions;
using Shouldly;

using Xunit;

Expand All @@ -25,7 +25,7 @@ public void Extension_RequireNotNull_throws_for_null()
// ReSharper disable once ExpressionIsAlwaysNull
Action action = () => o.RequireNotNull("boom");

action.Should().Throw<ArgumentException>().WithMessage("boom");
action.ShouldThrow<ArgumentException>().Message.ShouldBe("boom");
}

[Fact]
Expand All @@ -52,11 +52,11 @@ public void Extension_RequireNotEmpty_throws_for_empty_enumerables()
{
Action action = () => (new object[] { }).RequireNotEmpty("boom");

action.Should().Throw<ArgumentException>().WithMessage("boom");
action.ShouldThrow<ArgumentException>().Message.ShouldBe("boom");
}

[Fact]
public void Extension_RequireNotEmpty_does_not_throw_for_enumerble_alternatives()
public void Extension_RequireNotEmpty_does_not_throw_for_enumerable_alternatives()
{
// ReSharper disable once CoVariantArrayConversion
(new object[] { }).RequireNotEmpty("boom", new[] { new[] { "" } }); // two arrays, because of the "params-array"
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.7zip.Tests/Commands/GeneralOutputCommandTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Cake.SevenZip.Commands;
using Cake.SevenZip.Parsers;

using FluentAssertions;
using Shouldly;

using Xunit;

Expand All @@ -19,8 +19,8 @@ public void OutputCommand_uses_its_own_parser<T>(BaseOutputCommand<T> command, T
where T : IOutput
{
var actual = command.OutputParser;
actual.Should().NotBeNull();
actual.Should().BeOfType(expectedParserType);
actual.ShouldNotBeNull();
actual.ShouldBeOfType(expectedParserType);
}

private class TestData : IEnumerable<object[]>
Expand Down
Loading

0 comments on commit 9a6c3c1

Please sign in to comment.