Skip to content

Commit 9adc496

Browse files
david-driscolldavid-driscoll
authored
Merge pull request #2049 from RocketSurgeonsGuild/update-latest
updated to latest bits
2 parents ad003ce + 2cd7229 commit 9adc496

729 files changed

Lines changed: 1517 additions & 8681 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.config/dotnet-tools.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"rollForward": false
1414
},
1515
"nuke.globaltool": {
16-
"version": "9.0.4",
16+
"version": "10.1.0",
1717
"commands": ["nuke"],
1818
"rollForward": false
1919
},
@@ -23,37 +23,37 @@
2323
"rollForward": false
2424
},
2525
"jetbrains.resharper.globaltools": {
26-
"version": "2024.3.9",
26+
"version": "2025.3.2",
2727
"commands": ["jb"],
2828
"rollForward": false
2929
},
3030
"jetbrains.dotcover.commandlinetools": {
31-
"version": "2024.3.9",
32-
"commands": ["dotnet-dotCover"],
31+
"version": "2025.3.2",
32+
"commands": ["dotCover"],
3333
"rollForward": false
3434
},
3535
"jetbrains.dottrace.globaltools": {
36-
"version": "2024.3.9",
36+
"version": "2025.3.2",
3737
"commands": ["dottrace"],
3838
"rollForward": false
3939
},
4040
"dotnet-coverage": {
41-
"version": "17.14.2",
41+
"version": "18.4.1",
4242
"commands": ["dotnet-coverage"],
4343
"rollForward": false
4444
},
4545
"dotnet-outdated-tool": {
46-
"version": "4.6.8",
46+
"version": "4.7.0",
4747
"commands": ["dotnet-outdated"],
4848
"rollForward": false
4949
},
5050
"husky": {
51-
"version": "0.7.2",
51+
"version": "0.8.0",
5252
"commands": ["husky"],
5353
"rollForward": false
5454
},
5555
"verify.tool": {
56-
"version": "0.6.0",
56+
"version": "0.7.0",
5757
"commands": ["dotnet-verify"],
5858
"rollForward": false
5959
},

‎Directory.Build.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project>
33
<ItemGroup>
4-
<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" Condition="'$(MSBuildProjectName)'!='.build'" />
5-
64
</ItemGroup>
75
</Project>

‎Directory.Packages.props‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.3.0-beta.2" />
1010
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.3.0-beta.2" />
1111
<GlobalPackageReference Include="Rocket.Surgery.MyAssembly" Version="1.3.0-beta.2" />
12-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25277.114" />
13-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.0.0-1.25277.114" />
12+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0-2.final" />
13+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.12.0-beta1.25218.8" />
1414
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1515
<GlobalPackageReference Include="Roslynator.Analyzers" Version="4.15.0" />
1616
<GlobalPackageReference Include="Roslynator.Formatting.Analyzers" Version="4.15.0" />
@@ -20,56 +20,49 @@
2020
<GlobalPackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
2121
<PackageVersion Include="xunit.analyzers" Version="1.27.0" />
2222
<GlobalPackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
23-
<GlobalPackageReference Include="JetBrains.ExternalAnnotations" Version="10.2.166" />
23+
<GlobalPackageReference Include="JetBrains.Annotations.Sources" Version="2025.2.4" Condition="$(MSBuildProjectName) != '.build'" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageVersion Include="JetBrains.Annotations.Sources" Version="2025.2.4" />
27-
<PackageVersion Include="JetBrains.dotCover.CommandLineTools" Version="2024.3.9" />
28-
29-
<PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2024.3.9" />
26+
<PackageVersion Include="JetBrains.dotCover.CommandLineTools" Version="2025.3.2" />
27+
<PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2025.3.2" />
3028
<PackageVersion Include="Polyfill" Version="9.9.0" />
3129
<PackageVersion Include="Serilog.Sinks.Spectre" Version="0.5.0" />
32-
<PackageVersion Include="TUnit" Version="0.80.0" />
33-
<PackageVersion Include="TUnit.Core" Version="0.80.0" />
30+
<PackageVersion Include="TUnit" Version="0.90.45" />
31+
<PackageVersion Include="TUnit.Core" Version="1.15.0" />
3432
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
3533
<PackageVersion Include="GitVersion.Tool" Version="6.6.0" />
3634
<PackageVersion Include="Nuke.Common" Version="9.0.4" />
3735
<PackageVersion Include="ReportGenerator" Version="5.5.1" />
3836
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.12" />
39-
<PackageVersion Include="NuGet.ProjectModel" Version="6.14.0" />
40-
41-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
42-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
43-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
44-
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="4.14.0" />
45-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0" />
37+
<PackageVersion Include="NuGet.ProjectModel" Version="7.3.0" />
38+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0-2.final" />
39+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0-2.final" />
40+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0-2.final" />
41+
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="5.3.0-2.final" />
42+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0-2.final" />
4643
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
4744
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
4845
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
4946
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
50-
5147
<PackageVersion Include="Serilog" Version="4.3.1" />
52-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
48+
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
5349
<PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" />
5450
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.19" />
55-
56-
57-
<PackageVersion Include="System.Reactive" Version="6.1.0" />
51+
<PackageVersion Include="System.Reactive" Version="7.0.0-preview.1" />
5852
<PackageVersion Include="DryIoc.dll" Version="6.0.0-preview-09" />
5953
<PackageVersion Include="DryIoc.Microsoft.DependencyInjection" Version="8.0.0-preview-04" />
60-
<PackageVersion Include="Microsoft.CodeCoverage" Version="17.14.1" />
54+
<PackageVersion Include="Microsoft.CodeCoverage" Version="18.0.1" />
6155
<PackageVersion Include="FakeItEasy" Version="9.0.1" />
62-
6356
<PackageVersion Include="Shouldly" Version="4.3.0" />
64-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
57+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
6558
<PackageVersion Include="Moq" Version="4.20.72" />
6659
<PackageVersion Include="NSubstitute" Version="5.3.0" />
6760
<PackageVersion Include="Verify.FakeItEasy" Version="2.1.0" />
6861
<PackageVersion Include="Verify.Moq" Version="2.2.0" />
6962
<PackageVersion Include="Verify.NSubstitute" Version="2.1.0" />
70-
<PackageVersion Include="Verify.TUnit" Version="29.5.0" />
71-
<PackageVersion Include="Verify.XUnit" Version="29.5.0" />
72-
<PackageVersion Include="Verify.XUnitV3" Version="29.5.0" />
63+
<PackageVersion Include="Verify.TUnit" Version="31.13.0" />
64+
<PackageVersion Include="Verify.XUnit" Version="31.12.5" />
65+
<PackageVersion Include="Verify.XUnitV3" Version="31.13.0" />
7366
<PackageVersion Include="xunit" Version="2.9.3" />
7467
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
7568
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

‎Directory.Packages.support.props‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<Project>
33
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
4-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
5-
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
6-
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
7-
<PackageVersion Update="Microsoft.Extensions.Logging" Version="8.0.1" />
8-
9-
<PackageVersion Update="Serilog.Extensions.Logging" Version="8.0.0" />
10-
</ItemGroup>
11-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
12-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="9.0.13" />
13-
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="9.0.13" />
14-
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="9.0.13" />
15-
<PackageVersion Update="Microsoft.Extensions.Logging" Version="9.0.13" />
16-
17-
<PackageVersion Update="Serilog.Extensions.Logging" Version="9.0.2" />
4+
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="10.0.3" />
5+
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
6+
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
7+
<PackageVersion Update="Microsoft.Extensions.Logging" Version="10.0.3" />
8+
<PackageVersion Update="Serilog.Extensions.Logging" Version="10.0.0" />
189
</ItemGroup>
1910
</Project>

‎src/Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<ItemGroup>
33
<PackageReference Include="Polyfill" PrivateAssets="all" />
4-
<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
54
</ItemGroup>
65
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
76
</Project>

‎src/Testing.TUnit/TUnitTestRecord.cs‎

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,47 +6,33 @@ namespace Rocket.Surgery.Extensions.Testing;
66
/// <summary>
77
/// The xunit test context
88
/// </summary>
9+
/// <remarks>
10+
/// The xunit test context
11+
/// </remarks>
12+
/// <param name="context"></param>
13+
/// <param name="logEventLevel"></param>
14+
/// <param name="outputTemplate"></param>
15+
/// <param name="configureLogger"></param>
916
[PublicAPI]
10-
public abstract class TUnitTestRecord<TContext> : RocketSurgeryTestContext<TContext>
17+
public abstract class TUnitTestRecord<TContext>(
18+
TestContext context,
19+
LogEventLevel logEventLevel = LogEventLevel.Verbose,
20+
string? outputTemplate = null,
21+
Action<TContext, LoggerConfiguration>? configureLogger = null
22+
) : RocketSurgeryTestContext<TContext>(
23+
configureLogger,
24+
logEventLevel,
25+
outputTemplate
26+
)
1127
where TContext : RocketSurgeryTestContext<TContext>, ILoggingTestContext
1228
{
13-
private readonly TestContext _context;
14-
private readonly LogEventLevel _logEventLevel;
15-
16-
/// <summary>
17-
/// The xunit test context
18-
/// </summary>
19-
/// <param name="context"></param>
20-
/// <param name="logEventLevel"></param>
21-
/// <param name="outputTemplate"></param>
22-
/// <param name="configureLogger"></param>
23-
protected TUnitTestRecord(
24-
TestContext context,
25-
LogEventLevel logEventLevel = LogEventLevel.Verbose,
26-
string? outputTemplate = null,
27-
Action<TContext, LoggerConfiguration>? configureLogger = null
28-
) : base(
29-
configureLogger,
30-
logEventLevel,
31-
outputTemplate
32-
)
33-
{
34-
_context = context;
35-
_logEventLevel = logEventLevel;
36-
}
29+
private readonly TestContext _context = context;
30+
private readonly LogEventLevel _logEventLevel = logEventLevel;
3731

3832
/// <inheritdoc />
39-
protected override void ConfigureLogger(TContext context, LoggerConfiguration loggerConfiguration)
40-
{
41-
loggerConfiguration
42-
.MinimumLevel.Is(_logEventLevel)
43-
.WriteTo.Sink(new TUnitSink(_context));
44-
}
45-
46-
public void AddArtifact(Artifact artifact)
47-
{
48-
_context.AddArtifact(artifact);
49-
}
33+
protected override void ConfigureLogger(TContext context, LoggerConfiguration loggerConfiguration) => loggerConfiguration
34+
.MinimumLevel.Is(_logEventLevel)
35+
.WriteTo.Sink(new TUnitSink(_context));
5036
}
5137

5238
/// <summary>

‎src/Testing/Rocket.Surgery.Extensions.Testing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
44
<IsTestProject>false</IsTestProject>

‎test/Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageReference Include="Shouldly" />
66
<Using Include="Shouldly" />
77
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
8-
<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
98
</ItemGroup>
109
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
1110
</Project>

‎test/Testing.AutoFixtures.Tests/AutoFixtureGeneratorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ await context
6666
.GenerateAsync();
6767

6868
// Then
69-
_ = await Verify(result).HashParameters().UseParameters(context.Id);
69+
_ = await Verify(result).UseParameters(context.Id);
7070
}
7171
}

‎test/Testing.AutoFixtures.Tests/Diagnostics/Rsaf0001Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public async Task GivenDiagnosticReported_WhenGenerate_ThenGeneratesOtherFixture
4141
var result = await context.GenerateAsync();
4242

4343
// Then
44-
_ = await Verify(result).HashParameters().UseParameters(context.Id);
44+
_ = await Verify(result).UseParameters(context.Id);
4545
}
4646
}

0 commit comments

Comments
 (0)