Skip to content

Commit b782199

Browse files
chriswalpenchriswalpen
committed
Merge branch 'release/v3.0.2'
2 parents c57a9ba + 8ab46bf commit b782199

9 files changed

Lines changed: 52 additions & 36 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## v3.0.2
8+
### Fixed
9+
- Get null return value from ExecutionContext caused an exception
10+
11+
### Changed
12+
- Updated to .NET10.0
13+
- Updated dependencies to latest versions
14+
715
## v3.0.0
816
### Added
917
- Benchmarks can be written in a class with the Methods to benchmark marked with the help of attributes.

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# http://www.appveyor.com/docs/appveyor-yml
22

33
environment:
4-
base_version: 3.0.0
4+
base_version: 3.0.1
55

66
# version format
77
version: $(base_version).{build}
88

99
image:
10-
- Visual Studio 2022
10+
- Visual Studio 2026
1111

1212
for:
1313
-

‎build/Build.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class Build : NukeBuild
3535
[GitRepository] readonly GitRepository GitRepository;
3636

3737
[Parameter("Version to be injected in the Build")]
38-
public string Version { get; set; } = $"3.0.0";
38+
public string Version { get; set; } = $"3.0.1";
3939

4040
[Parameter("The Buildnumber provided by the CI")]
41-
public int BuildNo = 16;
41+
public int BuildNo = 1;
4242

4343
[Parameter("Is RC Version")]
4444
public bool IsRc = false;

‎build/_build.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
15-
<PackageReference Include="Nuke.Common" Version="9.0.4" />
16-
<PackageReference Include="dotnet-sonarscanner" Version="10.1.2">
14+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
15+
<PackageReference Include="Nuke.Common" Version="10.1.0" />
16+
<PackageReference Include="dotnet-sonarscanner" Version="11.2.1">
1717
<ExcludeAssets>all</ExcludeAssets>
1818
</PackageReference>
1919
</ItemGroup>

‎src/MeasureMap/ProfilerResult.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace MeasureMap
1111
/// </summary>
1212
public class ProfilerResult : IProfilerResult
1313
{
14-
private readonly List<IResult> _results = new List<IResult>();
14+
private readonly List<IResult> _results = new();
1515

1616
/// <summary>
1717
/// Creates a profiler result
@@ -36,7 +36,7 @@ public ProfilerResult()
3636
/// This is a summary of all Iterations over all threads.
3737
/// Thre results of each thread is accessed through the enumerator
3838
/// </summary>
39-
public IEnumerable<IIterationResult> Iterations => _results.SelectMany(r => r.Iterations);
39+
public IEnumerable<IIterationResult> Iterations => _results.SelectMany(r => r.Iterations.Where(i => i != null));
4040

4141
/// <summary>
4242
/// Gets the fastest iterations
@@ -130,6 +130,11 @@ public TimeSpan TotalTime
130130
/// <param name="result"></param>
131131
public void Add(IResult result)
132132
{
133+
if (result == null)
134+
{
135+
return;
136+
}
137+
133138
_results.Add(result);
134139
Last = result;
135140
}

‎src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>

‎src/Tests/MeasureMap.BenchmarkTests/MeasureMap.BenchmarkTests.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="6.0.2"/>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
14-
<PackageReference Include="NUnit" Version="4.4.0" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
12+
<PackageReference Include="coverlet.collector" Version="8.0.1">
1613
<PrivateAssets>all</PrivateAssets>
1714
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1815
</PackageReference>
19-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
20-
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
17+
<PackageReference Include="NUnit" Version="4.5.1" />
18+
<PackageReference Include="NUnit.Analyzers" Version="4.12.0">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
23+
<PackageReference Include="AwesomeAssertions" Version="9.4.0" />
2124
</ItemGroup>
2225

2326
<ItemGroup>
24-
<Using Include="NUnit.Framework"/>
27+
<Using Include="NUnit.Framework" />
2528
<Using Include="AwesomeAssertions" />
2629
</ItemGroup>
2730

‎src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<LangVersion>latest</LangVersion>
77

@@ -10,24 +10,24 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
13+
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
18-
<PackageReference Include="NUnit" Version="4.4.0" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
20-
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
18+
<PackageReference Include="NUnit" Version="4.5.1" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.12.0">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="coverlet.collector" Version="6.0.4">
24+
<PackageReference Include="coverlet.collector" Version="8.0.1">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
28+
<PackageReference Include="AwesomeAssertions" Version="9.4.0" />
2929
<PackageReference Include="Moq" Version="4.20.72" />
30-
<PackageReference Include="Polaroider" Version="2.4.0" />
30+
<PackageReference Include="Polaroider" Version="2.4.1" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Tests/Measuremap.IntegrationTest/Measuremap.IntegrationTest.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<LangVersion>latest</LangVersion>
77

@@ -17,19 +17,19 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="BDTest" Version="2.3.58" />
20-
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
22-
<PackageReference Include="NUnit" Version="4.4.0" />
23-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
24-
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
20+
<PackageReference Include="AwesomeAssertions" Version="9.4.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
22+
<PackageReference Include="NUnit" Version="4.5.1" />
23+
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
24+
<PackageReference Include="NUnit.Analyzers" Version="4.12.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="coverlet.collector" Version="6.0.4">
28+
<PackageReference Include="coverlet.collector" Version="8.0.1">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>
32-
<PackageReference Include="Polaroider" Version="2.4.0" />
32+
<PackageReference Include="Polaroider" Version="2.4.1" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

0 commit comments

Comments
 (0)