Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bump all dependencies #2198

Merged
merged 3 commits into from
May 9, 2023
Merged

Bump all dependencies #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
350da1f
Bump Nuke to 7.0.0
dennisdoomen May 7, 2023
b835406
Bump the Roslyn analyzers and disable a new rule
dennisdoomen May 7, 2023
3a657c3
Bump the remainder of our dependencies.
dennisdoomen May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .nuke/build.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Build Schema",
"$ref": "#/definitions/build",
"title": "Build Schema",
"definitions": {
"build": {
"type": "object",
Expand Down Expand Up @@ -128,4 +128,4 @@
}
}
}
}
}
32 changes: 17 additions & 15 deletions Build/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@ class Build : NukeBuild
[GitRepository]
readonly GitRepository GitRepository;

[PackageExecutable("nspec", "NSpecRunner.exe", Version = "3.1.0")]
[NuGetPackage("nspec", "NSpecRunner.exe", Version = "3.1.0")]
Tool NSpec3;

#if OS_WINDOWS
[PackageExecutable("Node.js.redist", "node.exe", Version = "16.17.1", Framework = "win-x64")]
[NuGetPackage("Node.js.redist", "node.exe", Version = "16.17.1", Framework = "win-x64")]
#elif OS_MAC
[PackageExecutable("Node.js.redist", "node", Version = "16.17.1", Framework = "osx-x64")]
[NuGetPackage("Node.js.redist", "node", Version = "16.17.1", Framework = "osx-x64")]
#else
[PackageExecutable("Node.js.redist", "node", Version = "16.17.1", Framework = "linux-x64")]
[NuGetPackage("Node.js.redist", "node", Version = "16.17.1", Framework = "linux-x64")]
#endif
Tool Node;

string YarnCli => $"{ToolPathResolver.GetPackageExecutable("Yarn.MSBuild", "yarn.js", "1.22.19")} --silent";
string YarnCli => $"{NuGetToolPathResolver.GetPackageExecutable("Yarn.MSBuild", "yarn.js", "1.22.19")}";

AbsolutePath ArtifactsDirectory => RootDirectory / "Artifacts";

Expand All @@ -84,8 +84,8 @@ class Build : NukeBuild
.OnlyWhenDynamic(() => RunAllTargets || HasSourceChanges)
.Executes(() =>
{
EnsureCleanDirectory(ArtifactsDirectory);
EnsureCleanDirectory(TestResultsDirectory);
ArtifactsDirectory.CreateOrCleanDirectory();
TestResultsDirectory.CreateOrCleanDirectory();
});

Target CalculateNugetVersion => _ => _
Expand Down Expand Up @@ -171,8 +171,10 @@ class Build : NukeBuild
.OnlyWhenDynamic(() => EnvironmentInfo.IsWin && (RunAllTargets || HasSourceChanges))
.Executes(() =>
{
IEnumerable<string> testAssemblies = Projects
.SelectMany(project => GlobFiles(project.Directory, "bin/Debug/net47/*.Specs.dll"));
string[] testAssemblies = Projects
.SelectMany(project => project.Directory.GlobFiles("bin/Debug/net47/*.Specs.dll"))
.Select(_ => _.ToString())
.ToArray();

Assert.NotEmpty(testAssemblies.ToList());

Expand Down Expand Up @@ -248,7 +250,7 @@ void ReportTestOutcome(params string[] globFilters)
.Executes(() =>
{
ReportGenerator(s => s
.SetProcessToolPath(ToolPathResolver.GetPackageExecutable("ReportGenerator", "ReportGenerator.dll", framework: "net6.0"))
.SetProcessToolPath(NuGetToolPathResolver .GetPackageExecutable("ReportGenerator", "ReportGenerator.dll", framework: "net6.0"))
.SetTargetDirectory(TestResultsDirectory / "reports")
.AddReports(TestResultsDirectory / "**/coverage.cobertura.xml")
.AddReportTypes(
Expand Down Expand Up @@ -299,7 +301,7 @@ void ReportTestOutcome(params string[] globFilters)

if (EnvironmentInfo.IsWin)
{
NSpec3(Solution.TestFrameworks.NSpec3_Net47_Specs.Directory / "bin" / "Debug" / "net47" / "NSpec3.Specs.dll");
NSpec3( $"{Solution.TestFrameworks.NSpec3_Net47_Specs.Directory / "bin" / "Debug" / "net47" / "NSpec3.Specs.dll"}");
}

ReportTestOutcome(projects.Select(p => $"*{p.Name}*.trx").ToArray());
Expand Down Expand Up @@ -334,9 +336,9 @@ void ReportTestOutcome(params string[] globFilters)
.ProceedAfterFailure()
.Executes(() =>
{
IReadOnlyCollection<string> packages = GlobFiles(ArtifactsDirectory, "*.nupkg");
var packages = ArtifactsDirectory.GlobFiles("*.nupkg");

Assert.NotEmpty(packages.ToList());
Assert.NotEmpty(packages);

DotNetNuGetPush(s => s
.SetApiKey(NuGetApiKey)
Expand All @@ -352,8 +354,8 @@ void ReportTestOutcome(params string[] globFilters)
.ProceedAfterFailure()
.Executes(() =>
{
Node($"{YarnCli} install", workingDirectory: RootDirectory);
Node($"{YarnCli} run cspell", workingDirectory: RootDirectory,
Node($"{YarnCli} --silent install", workingDirectory: RootDirectory);
Node($"{YarnCli} --silent run cspell", workingDirectory: RootDirectory,
customLogger: (_, msg) => Error(msg));
});

Expand Down
10 changes: 5 additions & 5 deletions Build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -19,12 +19,12 @@
<ItemGroup>
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
<PackageDownload Include="NSpec" Version="[3.1.0]" />
<PackageDownload Include="ReportGenerator" Version="[5.1.19]" />
<PackageDownload Include="ReportGenerator" Version="[5.1.20]" />
<PackageDownload Include="xunit.runner.console" Version="[2.4.2]" />
<PackageDownload Include="Node.js.redist" Version="[16.17.1]" />
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
<PackageReference Include="Nuke.Common" Version="6.3.0" />
<PackageReference Include="Nuke.Components" Version="6.3.0" />
<PackageReference Include="LibGit2Sharp" Version="0.27.2" />
<PackageReference Include="Nuke.Common" Version="7.0.0" />
<PackageReference Include="Nuke.Components" Version="7.0.0" />
<PackageDownload Include="Yarn.MSBuild" Version="[1.22.19]" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.2.0">
<PackageReference Include="Roslynator.Analyzers" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.26">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.46">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Src/FluentAssertions/FluentAssertions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="PolySharp" Version="1.12.1" PrivateAssets="all" />
<PackageReference Include="PolySharp" Version="1.13.1" PrivateAssets="all" />
<None Include="..\FluentAssertions.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
8 changes: 4 additions & 4 deletions Tests/Approval.Tests/Approval.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -11,9 +11,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
<PackageReference Include="Verify.DiffPlex" Version="2.2.0" />
<PackageReference Include="Verify.Xunit" Version="19.10.0" />
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
<PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
<PackageReference Include="Verify.Xunit" Version="19.14.1" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Tests/FluentAssertions.Equivalency.Specs/FluentAssertions.Equivalency.Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;net6.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
Expand Down Expand Up @@ -49,7 +49,7 @@

<ItemGroup>
<PackageReference Include="Chill" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
Expand Down
52 changes: 26 additions & 26 deletions Tests/FluentAssertions.Specs/Primitives/DateTimeOffsetAssertionSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class HaveValue
public void When_nullable_datetimeoffset_value_with_a_value_to_have_a_value_it_should_succeed()
{
// Arrange
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action action = () => nullableDateTime.Should().HaveValue();
Expand Down Expand Up @@ -57,7 +57,7 @@ public void Should_succeed_when_asserting_nullable_datetimeoffset_value_without_
public void Should_fail_when_asserting_nullable_datetimeoffset_value_with_a_value_to_not_have_a_value()
{
// Arrange
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action action = () =>
Expand All @@ -74,7 +74,7 @@ public class NotBeNull
public void When_nullable_datetimeoffset_value_with_a_value_not_be_null_it_should_succeed()
{
// Arrange
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action action = () => nullableDateTime.Should().NotBeNull();
Expand Down Expand Up @@ -117,7 +117,7 @@ public void Should_succeed_when_asserting_nullable_datetimeoffset_value_without_
public void Should_fail_when_asserting_nullable_datetimeoffset_value_with_a_value_to_be_null()
{
// Arrange
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action action = () =>
Expand All @@ -134,8 +134,8 @@ public class Be
public void Should_succeed_when_asserting_datetimeoffset_value_is_equal_to_the_same_value()
{
// Arrange
DateTimeOffset dateTime = new DateTime(2016, 06, 04);
DateTimeOffset sameDateTime = new DateTime(2016, 06, 04);
DateTimeOffset dateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this be a place that the type is now so explicit, you could consider using var?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, normally I would.

DateTimeOffset sameDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action act = () => dateTime.Should().Be(sameDateTime);
Expand All @@ -148,8 +148,8 @@ public void Should_succeed_when_asserting_datetimeoffset_value_is_equal_to_the_s
public void When_datetimeoffset_value_is_equal_to_the_same_nullable_value_be_should_succeed()
{
// Arrange
DateTimeOffset dateTime = 4.June(2016);
DateTimeOffset? sameDateTime = 4.June(2016);
DateTimeOffset dateTime = 4.June(2016).ToDateTimeOffset();
DateTimeOffset? sameDateTime = 4.June(2016).ToDateTimeOffset();

// Act
Action act = () => dateTime.Should().Be(sameDateTime);
Expand Down Expand Up @@ -220,8 +220,8 @@ public void When_datetimeoffset_value_is_equal_to_the_different_nullable_value_b
public void Should_succeed_when_asserting_nullable_datetimeoffset_value_equals_the_same_value()
{
// Arrange
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04).ToDateTimeOffset();
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action action = () =>
Expand All @@ -246,8 +246,8 @@ public void Should_succeed_when_asserting_nullable_datetimeoffset_null_value_equ
public void Should_fail_when_asserting_nullable_datetimeoffset_value_equals_a_different_value()
{
// Arrange
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 06);
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04).ToDateTimeOffset();
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 06).ToDateTimeOffset();

// Act
Action action = () =>
Expand Down Expand Up @@ -313,8 +313,8 @@ public class NotBe
public void Should_succeed_when_asserting_datetimeoffset_value_is_not_equal_to_a_different_value()
{
// Arrange
DateTimeOffset dateTime = new DateTime(2016, 06, 04);
DateTimeOffset otherDateTime = new DateTime(2016, 06, 05);
DateTimeOffset dateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();
DateTimeOffset otherDateTime = new DateTime(2016, 06, 05).ToDateTimeOffset();

// Act
Action act = () => dateTime.Should().NotBe(otherDateTime);
Expand All @@ -327,8 +327,8 @@ public void Should_succeed_when_asserting_datetimeoffset_value_is_not_equal_to_a
public void When_datetimeoffset_value_is_not_equal_to_a_nullable_different_value_notbe_should_succeed()
{
// Arrange
DateTimeOffset dateTime = 4.June(2016);
DateTimeOffset? otherDateTime = 5.June(2016);
DateTimeOffset dateTime = 4.June(2016).ToDateTimeOffset();
DateTimeOffset? otherDateTime = 5.June(2016).ToDateTimeOffset();

// Act
Action act = () => dateTime.Should().NotBe(otherDateTime);
Expand Down Expand Up @@ -390,8 +390,8 @@ public class BeExactly
public void Should_succeed_when_asserting_value_is_exactly_equal_to_the_same_value()
{
// Arrange
DateTimeOffset dateTime = new DateTime(2016, 06, 04);
DateTimeOffset sameDateTime = new DateTime(2016, 06, 04);
DateTimeOffset dateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();
DateTimeOffset sameDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act / Assert
dateTime.Should().BeExactly(sameDateTime);
Expand All @@ -401,8 +401,8 @@ public void Should_succeed_when_asserting_value_is_exactly_equal_to_the_same_val
public void Should_succeed_when_asserting_value_is_exactly_equal_to_the_same_nullable_value()
{
// Arrange
DateTimeOffset dateTime = 4.June(2016);
DateTimeOffset? sameDateTime = 4.June(2016);
DateTimeOffset dateTime = 4.June(2016).ToDateTimeOffset();
DateTimeOffset? sameDateTime = 4.June(2016).ToDateTimeOffset();

// Act / Assert
dateTime.Should().BeExactly(sameDateTime);
Expand Down Expand Up @@ -442,8 +442,8 @@ public void Should_fail_when_asserting_value_is_exactly_equal_to_a_different_nul
public void Should_succeed_when_asserting_nullable_value_is_exactly_equal_to_the_same_nullable_value()
{
// Arrange
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04).ToDateTimeOffset();
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act / Assert
nullableDateTimeA.Should().BeExactly(nullableDateTimeB);
Expand All @@ -464,8 +464,8 @@ public void Should_succeed_when_asserting_nullable_null_value_exactly_equals_nul
public void Should_fail_when_asserting_nullable_value_exactly_equals_a_different_value()
{
// Arrange
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04);
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 06);
DateTimeOffset? nullableDateTimeA = new DateTime(2016, 06, 04).ToDateTimeOffset();
DateTimeOffset? nullableDateTimeB = new DateTime(2016, 06, 06).ToDateTimeOffset();

// Act
Action action = () =>
Expand Down Expand Up @@ -2490,8 +2490,8 @@ public class ChainingConstraint
public void Should_support_chaining_constraints_with_and()
{
// Arrange
DateTimeOffset yesterday = new DateTime(2016, 06, 03);
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04);
DateTimeOffset yesterday = new DateTime(2016, 06, 03).ToDateTimeOffset();
DateTimeOffset? nullableDateTime = new DateTime(2016, 06, 04).ToDateTimeOffset();

// Act
Action action = () =>
Expand Down
6 changes: 3 additions & 3 deletions Tests/TestFrameworks/MSTestV2.Specs/MSTestV2.Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MSTestV2.Specs</RootNamespace>
Expand All @@ -12,7 +12,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MSpec.Specs</RootNamespace>
Expand All @@ -12,7 +12,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Machine.Specifications" Version="1.1.0" />
<PackageReference Include="Machine.Specifications" Version="1.1.1" />
<PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.2" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down