Skip to content

Bump all all dependencies, including Nuke #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2025
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
26 changes: 26 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "16:00"
timezone: "Europe/Copenhagen"

- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "16:00"
timezone: "Europe/Copenhagen"
groups:
xunit:
patterns:
- "xunit*"
- "Verify*"
nuke:
patterns:
- "Nuke*"

4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
2.1.x
3.1.x
6.0.x
7.0.x
8.0.x

- name: Run NUKE
run: ./build.ps1
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
2.1.x
3.1.x
6.0.x
7.0.x
8.0.x

- name: Run NUKE
run: ./build.sh UnitTests
148 changes: 77 additions & 71 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,70 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/build",
"title": "Build Schema",
"definitions": {
"build": {
"type": "object",
"Host": {
"type": "string",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"ExecutableTarget": {
"type": "string",
"enum": [
"ApiChecks",
"CalculateNugetVersion",
"Clean",
"CodeCoverage",
"Compile",
"Pack",
"Push",
"Restore",
"UnitTests",
"UnitTestsNetCore",
"UnitTestsNetFramework"
]
},
"Verbosity": {
"type": "string",
"description": "",
"enum": [
"Verbose",
"Normal",
"Minimal",
"Quiet"
]
},
"NukeBuild": {
"properties": {
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"GenerateBinLog": {
"type": "boolean",
"description": "Use this parameter if you encounter build problems in any way, to generate a .binlog file which holds some useful information"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
"$ref": "#/definitions/Host"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"NuGetApiKey": {
"type": "string",
"description": "The key to push to Nuget",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
Expand All @@ -71,57 +88,46 @@
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"ApiChecks",
"CalculateNugetVersion",
"Clean",
"CodeCoverage",
"Compile",
"Pack",
"Push",
"Restore",
"UnitTests",
"UnitTestsNetCore",
"UnitTestsNetFramework"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"ApiChecks",
"CalculateNugetVersion",
"Clean",
"CodeCoverage",
"Compile",
"Pack",
"Push",
"Restore",
"UnitTests",
"UnitTestsNetCore",
"UnitTestsNetFramework"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
"$ref": "#/definitions/Verbosity"
}
}
}
},
"allOf": [
{
"properties": {
"GenerateBinLog": {
"type": [
"boolean",
"null"
],
"description": "Use this parameter if you encounter build problems in any way, to generate a .binlog file which holds some useful information"
},
"NuGetApiKey": {
"type": "string",
"description": "The key to push to Nuget",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
}
}
},
{
"$ref": "#/definitions/NukeBuild"
}
}
]
}
6 changes: 1 addition & 5 deletions Build/Build.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using LibGit2Sharp;
using Nuke.Common;
using Nuke.Common.CI.GitHubActions;
using Nuke.Common.Execution;
Expand All @@ -12,10 +10,8 @@
using Nuke.Common.Tools.GitVersion;
using Nuke.Common.Tools.ReportGenerator;
using Nuke.Common.Tools.Xunit;
using Nuke.Common.Utilities;
using Nuke.Common.Utilities.Collections;
using Nuke.Components;
using static Nuke.Common.IO.FileSystemTasks;
using static Nuke.Common.IO.PathConstruction;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks;
using static Nuke.Common.Tools.Xunit.XunitTasks;
Expand Down
9 changes: 5 additions & 4 deletions Build/_build.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..\</NukeRootDirectory>
<NukeScriptDirectory>..\</NukeScriptDirectory>
<NukeTelemetryVersion>1</NukeTelemetryVersion>
</PropertyGroup>
<ItemGroup>
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
<PackageDownload Include="ReportGenerator" Version="[5.1.23]" />
<PackageDownload Include="xunit.runner.console" Version="[2.5.0]" />
<PackageReference Include="LibGit2Sharp" Version="0.27.2" />
<PackageReference Include="Nuke.Common" Version="7.0.6" />
<PackageReference Include="Nuke.Components" Version="7.0.6" />
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
<PackageReference Include="Nuke.Common" Version="9.0.3" />
<PackageReference Include="Nuke.Components" Version="9.0.3" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.4">
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.182">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
<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 @@ -11,7 +11,7 @@ internal static class AssertionChainExtensions
/// </summary>
public static AssertionChain For(this AssertionChain chain, IEquivalencyValidationContext context)
{
chain.OverrideCallerIdentifier(() => context.CurrentNode.Description);
chain.OverrideCallerIdentifier(() => context.CurrentNode.Subject.Description);

return chain
.WithReportable("configuration", () => context.Options.ToString())
Expand Down
4 changes: 2 additions & 2 deletions Src/FluentAssertions.DataSets/DataColumnAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public AndConstraint<DataColumnAssertions> BeEquivalentTo(DataColumn expectation
/// A reference to the <see cref="IDataEquivalencyAssertionOptions{DataColumn}"/> configuration object that can be used
/// to influence the way the object graphs are compared. You can also provide an alternative instance of the
/// <see cref="IDataEquivalencyAssertionOptions{DataColumn}"/> class. The global defaults are determined by the
/// <see cref="AssertionOptions"/> class.
/// <see cref="AssertionConfiguration"/> class.
/// </param>
/// <param name="because">
/// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
Expand All @@ -118,7 +118,7 @@ public AndConstraint<DataColumnAssertions> BeEquivalentTo(DataColumn expectation
{
Guard.ThrowIfArgumentIsNull(config);

var defaults = new DataEquivalencyAssertionOptions<DataColumn>(AssertionOptions.CloneDefaults<DataColumn>());
var defaults = new DataEquivalencyAssertionOptions<DataColumn>(AssertionConfiguration.Current.Equivalency.CloneDefaults<DataColumn>());
config(defaults);

((object)Subject).Should().BeEquivalentTo(expectation, _ => defaults, because, becauseArgs);
Expand Down
4 changes: 2 additions & 2 deletions Src/FluentAssertions.DataSets/DataRowAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public AndConstraint<DataRowAssertions<TDataRow>> BeEquivalentTo(DataRow expecta
/// A reference to the <see cref="IDataEquivalencyAssertionOptions{DataRow}"/> configuration object that can be used
/// to influence the way the object graphs are compared. You can also provide an alternative instance of the
/// <see cref="IDataEquivalencyAssertionOptions{DataRow}"/> class. The global defaults are determined by the
/// <see cref="AssertionOptions"/> class.
/// <see cref="AssertionConfiguration"/> class.
/// </param>
/// <param name="because">
/// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
Expand All @@ -190,7 +190,7 @@ public AndConstraint<DataRowAssertions<TDataRow>> BeEquivalentTo(DataRow expecta
{
Guard.ThrowIfArgumentIsNull(config);

var defaults = new DataEquivalencyAssertionOptions<DataRow>(AssertionOptions.CloneDefaults<DataRow>());
var defaults = new DataEquivalencyAssertionOptions<DataRow>(AssertionConfiguration.Current.Equivalency.CloneDefaults<DataRow>());
config(defaults);

((object)Subject).Should().BeEquivalentTo(expectation, _ => defaults, because, becauseArgs);
Expand Down
4 changes: 2 additions & 2 deletions Src/FluentAssertions.DataSets/DataSetAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public AndConstraint<DataSetAssertions<TDataSet>> BeEquivalentTo(DataSet expecta
/// A reference to the <see cref="IDataEquivalencyAssertionOptions{DataSet}"/> configuration object that can be used
/// to influence the way the object graphs are compared. You can also provide an alternative instance of the
/// <see cref="IDataEquivalencyAssertionOptions{DataSet}"/> class. The global defaults are determined by the
/// <see cref="AssertionOptions"/> class.
/// <see cref="AssertionConfiguration"/> class.
/// </param>
/// <param name="because">
/// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
Expand All @@ -244,7 +244,7 @@ public AndConstraint<DataSetAssertions<TDataSet>> BeEquivalentTo(DataSet expecta
{
Guard.ThrowIfArgumentIsNull(config);

var defaults = new DataEquivalencyAssertionOptions<DataSet>(AssertionOptions.CloneDefaults<DataSet>());
var defaults = new DataEquivalencyAssertionOptions<DataSet>(AssertionConfiguration.Current.Equivalency.CloneDefaults<DataSet>());
config(defaults);

((object)Subject).Should().BeEquivalentTo(expectation, _ => defaults, because, becauseArgs);
Expand Down
4 changes: 2 additions & 2 deletions Src/FluentAssertions.DataSets/DataTableAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public AndConstraint<DataTableAssertions<TDataTable>> BeEquivalentTo(DataTable e
/// A reference to the <see cref="IDataEquivalencyAssertionOptions{DataTable}"/> configuration object that can be used
/// to influence the way the object graphs are compared. You can also provide an alternative instance of the
/// <see cref="IDataEquivalencyAssertionOptions{DataTable}"/> class. The global defaults are determined by the
/// <see cref="AssertionOptions"/> class.
/// <see cref="AssertionConfiguration"/> class.
/// </param>
/// <param name="because">
/// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
Expand All @@ -257,7 +257,7 @@ public AndConstraint<DataTableAssertions<TDataTable>> BeEquivalentTo(DataTable e
{
Guard.ThrowIfArgumentIsNull(config);

var defaults = new DataEquivalencyAssertionOptions<DataTable>(AssertionOptions.CloneDefaults<DataTable>());
var defaults = new DataEquivalencyAssertionOptions<DataTable>(AssertionConfiguration.Current.Equivalency.CloneDefaults<DataTable>());
config(defaults);

((object)Subject).Should().BeEquivalentTo(expectation, _ => defaults, because, becauseArgs);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ protected override EquivalencyResult OnHandle(Comparands comparands, IEquivalenc
var expectation = (Constraint)comparands.Expectation;

var selectedMembers = GetMembersFromExpectation(comparands, context.CurrentNode, context.Options)
.ToDictionary(member => member.Name);
.ToDictionary(member => member.Expectation.Name);

CompareCommonProperties(context, nestedValidator, context.Options, subject, expectation, selectedMembers, assertionChain);

Expand Down
Loading
Loading