Skip to content

Commit 2294e2a

Browse files
FiniteRealityFiniteReality
committed
Bump package versions and fix warnings
1 parent 8d9f661 commit 2294e2a

10 files changed

+31
-88
lines changed

‎Directory.Build.targets‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222
<!-- Package versions for package references across all projects -->
2323
<ItemGroup>
2424
<PackageReference Update="coverlet.msbuild" Version="2.8.1" />
25-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.2.20160.3" />
26-
<PackageReference Update="Microsoft.Extensions.Hosting" Version="5.0.0-preview.2.20160.3" />
27-
<PackageReference Update="Microsoft.Extensions.Http" Version="5.0.0-preview.2.20160.3" />
28-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.2.20160.3" />
29-
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-preview.2.20160.3" />
30-
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.7.0-1.final" />
31-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
32-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
33-
<PackageReference Update="NUnit" Version="3.12.0" />
34-
<PackageReference Update="NUnit3TestAdapter" Version="3.16.1" />
25+
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
26+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
27+
<PackageReference Update="Microsoft.Extensions.Hosting" Version="5.0.0" />
28+
<PackageReference Update="Microsoft.Extensions.Http" Version="5.0.0" />
29+
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
30+
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
31+
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0-3.final" />
32+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20210106-01" />
33+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" />
34+
<PackageReference Update="NUnit" Version="3.13.0" />
35+
<PackageReference Update="NUnit3TestAdapter" Version="3.17.0" />
3536
</ItemGroup>
3637

3738
</Project>

‎src/Configuration/Finite.Metrics.Configuration.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14+
<PackageReference Include="Microsoft.Extensions.Configuration" />
1415
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
1516
</ItemGroup>
1617

‎src/Core/MetricFactory.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,13 @@ public MetricFactory(IEnumerable<IMetricProvider> providers)
3838
public static IMetricFactory Create(Action<IMetricsBuilder> configure)
3939
{
4040
var collection = new ServiceCollection();
41-
_ = collection.AddMetrics(configure);
41+
var builder = collection.AddMetrics();
42+
43+
configure(builder);
44+
4245
var provider = collection.BuildServiceProvider();
4346

44-
var factory = provider.GetService<IMetricFactory>();
47+
var factory = provider.GetRequiredService<IMetricFactory>();
4548

4649
return new DisposingMetricsFactory(factory, provider);
4750
}

‎src/Core/MetricsServiceCollectionExtensions.cs‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,8 @@ public static class MetricsServiceCollectionExtensions
2121
/// The <see cref="IServiceCollection"/> so that additional calls can
2222
/// be chained.
2323
/// </returns>
24-
public static IServiceCollection AddMetrics(
24+
public static IMetricsBuilder AddMetrics(
2525
this IServiceCollection services)
26-
=> AddMetrics(services, builder => { });
27-
28-
29-
/// <summary>
30-
/// Adds metrics services to the specified
31-
/// <see cref="IServiceCollection"/>.
32-
/// </summary>
33-
/// <param name="services">
34-
/// The <see cref="IServiceCollection"/> to add services to.
35-
/// </param>
36-
/// <param name="configure">
37-
/// The <see cref="IMetricsBuilder"/> configuration delegate.
38-
/// </param>
39-
/// <returns>
40-
/// The <see cref="IServiceCollection"/> so that additional calls can
41-
/// be chained.
42-
/// </returns>
43-
public static IServiceCollection AddMetrics(
44-
this IServiceCollection services,
45-
Action<IMetricsBuilder> configure)
4626
{
4727
if (services is null)
4828
throw new ArgumentNullException(nameof(services));
@@ -51,8 +31,7 @@ public static IServiceCollection AddMetrics(
5131
.Singleton<IMetricFactory, MetricFactory>());
5232
services.TryAdd(ServiceDescriptor.Singleton<IMetric, Metric>());
5333

54-
configure(new MetricsBuilder(services));
55-
return services;
34+
return new MetricsBuilder(services);
5635
}
5736
}
5837
}

‎tests/Configuration/MetricProviderConfigurationFactory.Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void GetConfigurationThrowsArgumentNullException()
2828
var parameter = method.GetParameters().First();
2929

3030
var ex = Assert.Throws<ArgumentNullException>(
31-
() => factory.GetConfiguration(null!));
31+
() => factory.GetConfiguration(null!))!;
3232

3333
Assert.AreEqual(parameter.Name, ex.ParamName);
3434
}

‎tests/Configuration/MetricsBuilderConfigurationExtensions.Tests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ public void AddConfigurationWithConfigAddsConfigurationServices()
5454
x => x.ServiceType == typeof(MetricsConfiguration));
5555

5656
Assert.NotNull(metricsConfigurationDescriptor);
57+
Assert.NotNull(
58+
metricsConfigurationDescriptor!.ImplementationInstance);
5759

5860
var metricsConfiguration = (MetricsConfiguration)
59-
metricsConfigurationDescriptor!.ImplementationInstance;
61+
metricsConfigurationDescriptor!.ImplementationInstance!;
6062

6163
Assert.AreEqual(configuration, metricsConfiguration.Configuration);
6264
}

‎tests/Core/Measure.Duration.Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void MeasureDurationNoTagsThrowsForNullParameter()
2424
var parameter = method.GetParameters().First();
2525

2626
var ex = Assert.Throws<ArgumentNullException>(
27-
() => Measure.Duration(null!));
27+
() => Measure.Duration(null!))!;
2828

2929
Assert.AreEqual(parameter.Name, ex.ParamName);
3030
}
@@ -72,7 +72,7 @@ public void MeasureDurationWithTagsThrowsForNullParameter()
7272
var parameter = method.GetParameters().First();
7373

7474
var ex = Assert.Throws<ArgumentNullException>(
75-
() => Measure.Duration(null!, new object()));
75+
() => Measure.Duration(null!, new object()))!;
7676

7777
Assert.AreEqual(parameter.Name, ex.ParamName);
7878
}

‎tests/Core/Metric.Tests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void IsEnabledThrowsAggregateException()
6969
};
7070

7171
var exception = Assert.Throws<AggregateException>(
72-
() => metric.IsEnabled());
72+
() => metric.IsEnabled())!;
7373

7474
Assert.AreEqual(1, exception.InnerExceptions.Count);
7575
Assert.IsInstanceOf<NotImplementedException>(
@@ -130,14 +130,14 @@ public void LogWhenEnabledThrowsAggregateException()
130130
};
131131

132132
var exception = Assert.Throws<AggregateException>(
133-
() => metric.Log(1));
133+
() => metric.Log(1))!;
134134

135135
Assert.AreEqual(1, exception.InnerExceptions.Count);
136136
Assert.IsInstanceOf<NotImplementedException>(
137137
exception.InnerExceptions[0]);
138138

139139
exception = Assert.Throws<AggregateException>(
140-
() => metric.Log(1, metric));
140+
() => metric.Log(1, metric))!;
141141

142142
Assert.AreEqual(1, exception.InnerExceptions.Count);
143143
Assert.IsInstanceOf<NotImplementedException>(

‎tests/Core/MetricFactory.Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void AddProviderThrowsArgumentNullException()
8282
var parameter = method.GetParameters().First();
8383

8484
var ex = Assert.Throws<ArgumentNullException>(
85-
() => factory.AddProvider(null!));
85+
() => factory.AddProvider(null!))!;
8686

8787
Assert.AreEqual(parameter.Name, ex.ParamName);
8888
}

‎tests/Core/MetricsServiceCollectionExtensions.Tests.cs‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Finite.Metrics.UnitTests
1111
public class MetricsServiceCollectionExtensionsTests
1212
{
1313
/// <summary>
14-
/// Ensures that <see cref="MetricsServiceCollectionExtensions.AddMetrics(IServiceCollection, Action{IMetricsBuilder})"/>
14+
/// Ensures that <see cref="MetricsServiceCollectionExtensions.AddMetrics(IServiceCollection)"/>
1515
/// throws an instance of <see cref="ArgumentNullException"/> when
1616
/// <c>null</c> is passed as a parameter, and that the exception's
1717
/// <see cref="ArgumentException.ParamName"/> property was the expected
@@ -28,7 +28,7 @@ public void AddMetricsThrowsForNullServiceCollection()
2828
var parameter = method.GetParameters().First();
2929

3030
var ex = Assert.Throws<ArgumentNullException>(
31-
() => MetricsServiceCollectionExtensions.AddMetrics(null!));
31+
() => MetricsServiceCollectionExtensions.AddMetrics(null!))!;
3232

3333
Assert.AreEqual(parameter.Name, ex.ParamName);
3434
}
@@ -67,48 +67,5 @@ public void MetricsServicesCanBeAddedMultipleTimes()
6767

6868
Assert.DoesNotThrow(() => collection.AddMetrics());
6969
}
70-
71-
/// <summary>
72-
/// Ensures that the <see cref="MetricsServiceCollectionExtensions.AddMetrics(IServiceCollection, System.Action{IMetricsBuilder})"/>
73-
/// method calls the passed delegate.
74-
/// </summary>
75-
[Test]
76-
public void AddMetricsWithDelegateCallsDelegate()
77-
{
78-
var collection = new ServiceCollection();
79-
80-
_ = collection.AddMetrics(_ => Assert.Pass());
81-
82-
Assert.Fail();
83-
}
84-
85-
/// <summary>
86-
/// Ensures that the <see cref="MetricsServiceCollectionExtensions.AddMetrics(IServiceCollection, System.Action{IMetricsBuilder})"/>
87-
/// method calls the passed delegate with an instance of
88-
/// <see cref="IMetricsBuilder"/>.
89-
/// </summary>
90-
[Test]
91-
public void AddMetricsWithDelegatePassedIMetricsBuilder()
92-
{
93-
var collection = new ServiceCollection();
94-
95-
_ = collection.AddMetrics(builder => Assert.NotNull(builder));
96-
}
97-
98-
/// <summary>
99-
/// Ensures that the <see cref="MetricsServiceCollectionExtensions.AddMetrics(IServiceCollection, System.Action{IMetricsBuilder})"/>
100-
/// method calls the passed delegate with an instance of
101-
/// <see cref="IMetricsBuilder"/>, whose
102-
/// <see cref="IMetricsBuilder.Services"/> property equals the
103-
/// container we called <c>AddMetrics</c> on.
104-
/// </summary>
105-
[Test]
106-
public void AddMetricsWithDelegateHasSameContainer()
107-
{
108-
var collection = new ServiceCollection();
109-
110-
_ = collection.AddMetrics(
111-
builder => Assert.AreEqual(collection, builder.Services));
112-
}
11370
}
11471
}

0 commit comments

Comments
 (0)