Skip to content

Commit 8eadf43

Browse files
Bump the analyzers group with 1 update (#457)
* Bump the analyzers group with 1 update Bumps Meziantou.Analyzer from 2.0.203 to 2.0.205 --- updated-dependencies: - dependency-name: Meziantou.Analyzer dependency-version: 2.0.205 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: analyzers ... Signed-off-by: dependabot[bot] <support@github.com> * FIX MA0053: Make class sealed * IDE0032: Use auto property * Fix IDE0350: Lambda expression can be simplified * Fix MA0026: TODO remove suppression when fixed --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vectron <thijs_bloebaum@hotmail.com>
1 parent dd6a12b commit 8eadf43

6 files changed

Lines changed: 20 additions & 32 deletions

File tree

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5050
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-Beta.556" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5151
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
52-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.203" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
52+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.205" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5353
<PackageReference Include="Meziantou.MSBuild.InternalsVisibleTo" Version="1.0.2" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5454
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.6.1-beta.1 " PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5555
<!--<PackageReference Include="ErrorProne.NET.Structs" Version="0.6.1-beta.1 " PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />-->

src/PlcInterface.Abstraction/Connected{T}.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ namespace PlcInterface;
44
/// A <see cref="IConnected{T}"/> implementation.
55
/// </summary>
66
/// <typeparam name="T">The type that is connected.</typeparam>
7-
public class Connected<T> : IConnected<T>
7+
public sealed class Connected<T> : IConnected<T>
88
{
9-
private readonly T? value;
10-
119
/// <summary>
1210
/// Initializes a new instance of the <see cref="Connected{T}"/> class.
1311
/// </summary>
1412
/// <param name="value">A <typeparamref name="T"/> containing the connection.</param>
1513
internal Connected(T value)
1614
{
17-
this.value = value;
15+
Value = value;
1816
IsConnected = true;
1917
}
2018

@@ -32,5 +30,5 @@ public bool IsConnected
3230
}
3331

3432
/// <inheritdoc/>
35-
public T Value => value ?? throw new InvalidOperationException($"There is no value when {nameof(IsConnected)} returns false");
33+
public T Value => field ?? throw new InvalidOperationException($"There is no value when {nameof(IsConnected)} returns false");
3634
}

test/PlcInterface.Abstraction/TypeConverterTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void ConvertConvertsDynamicObjectToType()
118118
var sourceMock = new Mock<DynamicObject>();
119119
var result = new object();
120120
_ = sourceMock.Setup(x => x.GetDynamicMemberNames()).Returns([nameof(TestType.IntValue), nameof(TestType.IntArray), nameof(TestType.SubType)]);
121-
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result)).Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
121+
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result)).Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
122122
{
123123
value = binder.Name switch
124124
{
@@ -232,7 +232,7 @@ public void ConvertSupportsRecordTypes()
232232
nameof(TestRecordType.SubType),
233233
]);
234234
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
235-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
235+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
236236
{
237237
value = binder.Name switch
238238
{
@@ -272,7 +272,7 @@ public void ConvertSupportsRecordValueTypes()
272272
nameof(TestRecordStructType.SubType),
273273
]);
274274
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
275-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
275+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
276276
{
277277
value = binder.Name switch
278278
{
@@ -312,7 +312,7 @@ public void ConvertSupportsValueTypes()
312312
nameof(TestValueType.SubType),
313313
]);
314314
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
315-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
315+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
316316
{
317317
value = binder.Name switch
318318
{
@@ -413,7 +413,7 @@ public void ConvertThrowsSymbolExceptionWhenMemberIsNull()
413413
nameof(TestType.SubType),
414414
]);
415415
_ = dynamicObjectSourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
416-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
416+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
417417
{
418418
value = binder.Name switch
419419
{
@@ -454,7 +454,7 @@ internal readonly DynamicObject GetDynamicObjectMock()
454454
var result = new object();
455455
_ = sourceMock.Setup(x => x.GetDynamicMemberNames()).Returns([nameof(IntValue)]);
456456
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
457-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
457+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
458458
{
459459
value = binder.Name switch
460460
{
@@ -484,7 +484,7 @@ internal readonly DynamicObject GetDynamicObjectMock()
484484
var result = new object();
485485
_ = sourceMock.Setup(x => x.GetDynamicMemberNames()).Returns([nameof(IntValue)]);
486486
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
487-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
487+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
488488
{
489489
value = binder.Name switch
490490
{
@@ -543,7 +543,7 @@ internal DynamicObject GetDynamicObjectMock()
543543
var result = new object();
544544
_ = sourceMock.Setup(x => x.GetDynamicMemberNames()).Returns([nameof(IntValue)]);
545545
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
546-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
546+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
547547
{
548548
value = binder.Name switch
549549
{
@@ -615,7 +615,7 @@ internal DynamicObject GetDynamicObjectMock()
615615
var result = new object();
616616
_ = sourceMock.Setup(x => x.GetDynamicMemberNames()).Returns([nameof(IntValue)]);
617617
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
618-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
618+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
619619
{
620620
value = binder.Name switch
621621
{

test/PlcInterface.Ads.Tests/AdsTypeConverterTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void ConvertChangesPlcOpenTypesToDotNetTypes()
4747
nameof(TimesTestType.DateTimeOffset),
4848
]);
4949
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
50-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
50+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
5151
{
5252
value = binder.Name switch
5353
{
@@ -120,7 +120,7 @@ public void ConvertConvertsToComplexArray()
120120
var dynamicValue = sourceMock.As<IDynamicValue>();
121121
_ = dynamicValue.SetupGet(x => x.DataType).Returns(ComplexArrayType([2]));
122122
var dummy = new object();
123-
_ = dynamicValue.Setup(x => x.TryGetIndexValue(It.IsAny<int[]>(), out dummy)).Returns(new MockDelegates.OutFunction<int[], object?, bool>((int[] indices, out object? value) =>
123+
_ = dynamicValue.Setup(x => x.TryGetIndexValue(It.IsAny<int[]>(), out dummy)).Returns(new MockDelegates.OutFunction<int[], object?, bool>((indices, out value) =>
124124
{
125125
value = ((NestedType)expected.GetValue(indices)!).GetDynamicObjectMock();
126126
return true;
@@ -145,7 +145,7 @@ public void ConvertConvertsToPrimitiveArray()
145145
_ = dynamicValue.SetupGet(x => x.DataType).Returns(IntArrayType([9]));
146146
var dummy = new object();
147147
_ = dynamicValue.Setup(x => x.TryGetIndexValue(It.IsAny<int[]>(), out dummy))
148-
.Returns(new MockDelegates.OutFunction<int[], object?, bool>((int[] indices, out object? value) =>
148+
.Returns(new MockDelegates.OutFunction<int[], object?, bool>((indices, out value) =>
149149
{
150150
value = expected.GetValue(indices);
151151
return true;
@@ -238,7 +238,7 @@ internal DynamicObject GetDynamicObjectMock()
238238
var result = new object();
239239
_ = sourceMock.Setup(x => x.GetDynamicMemberNames()).Returns([nameof(IntValue)]);
240240
_ = sourceMock.Setup(x => x.TryGetMember(It.IsAny<GetMemberBinder>(), out result))
241-
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((GetMemberBinder binder, out object value) =>
241+
.Returns(new MockDelegates.OutFunction<GetMemberBinder, object, bool>((binder, out value) =>
242242
{
243243
value = binder.Name switch
244244
{

test/PlcInterface.Ads.Tests/DynamicObjectExtensionsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void CleanDynamicConvertsStructTypeToExpando()
134134
var iDynamicValueDynamicObjectMock = dynamicObjectMock.As<IDynamicValue>();
135135
_ = iDynamicValueDynamicObjectMock.SetupGet(x => x.DataType).Returns(Mock.Of<IStructType>());
136136
_ = iDynamicValueDynamicObjectMock.Setup(x => x.TryGetMemberValue(It.IsAny<string>(), out dummy))
137-
.Callback(new MockDelegates.OutAction<string, object?>((string name, out object? value)
137+
.Callback(new MockDelegates.OutAction<string, object?>((name, out value)
138138
=> value = name switch
139139
{
140140
"Property1" => 255,
@@ -167,7 +167,7 @@ public void CleanDynamicStructCanHandleNestedStruct()
167167
var nestedDynamicIDynamicValue = nestedDynamicMock.As<IDynamicValue>();
168168
_ = nestedDynamicIDynamicValue.SetupGet(x => x.DataType).Returns(Mock.Of<IStructType>());
169169
_ = nestedDynamicIDynamicValue.Setup(x => x.TryGetMemberValue(It.IsAny<string>(), out dummy))
170-
.Callback(new MockDelegates.OutAction<string, object?>((string name, out object? value)
170+
.Callback(new MockDelegates.OutAction<string, object?>((name, out value)
171171
=> value = name switch
172172
{
173173
"Nested1" => 255,
@@ -207,7 +207,7 @@ public void CleanDynamicStructConvertsNestedPlcOpenTypes()
207207
var firstIDynamicValue = firstDynamic.As<IDynamicValue>();
208208
_ = firstIDynamicValue.SetupGet(x => x.DataType).Returns(Mock.Of<IStructType>());
209209
_ = firstIDynamicValue.Setup(x => x.TryGetMemberValue(It.IsAny<string>(), out dummy))
210-
.Returns(new MockDelegates.OutFunction<string, object?, bool>((string name, out object? value) =>
210+
.Returns(new MockDelegates.OutFunction<string, object?, bool>((name, out value) =>
211211
{
212212
value = name switch
213213
{

test/PlcInterface.Ads.Tests/ReadWriteTests.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,7 @@ public async Task ReadValueReturnsTheExpectedValueAsync()
8484
Assert.AreEqual(dummyValue, value4);
8585
}
8686

87-
// TODO remove suppression when fixed
8887
[TestMethod]
89-
[System.Diagnostics.CodeAnalysis.SuppressMessage(
90-
"IDisposableAnalyzers.Correctness",
91-
"IDISP013:Await in using",
92-
Justification = "Problem with expressionTrees; see https://github.com/DotNetAnalyzers/IDisposableAnalyzers/issues/370")]
9388
public async Task ReadValuesReturnsTheExpectedValuesAsync()
9489
{
9590
// Arrange
@@ -202,12 +197,7 @@ public async Task WriteCallsUnderlyingWriteMethodAsync()
202197
valueSymbolMock.Verify(x => x.WriteValueAsync(It.Is<int>(x => dummyValue == x), It.IsAny<CancellationToken>()), Times.Once);
203198
}
204199

205-
// TODO remove suppression when fixed
206200
[TestMethod]
207-
[System.Diagnostics.CodeAnalysis.SuppressMessage(
208-
"IDisposableAnalyzers.Correctness",
209-
"IDISP013:Await in using",
210-
Justification = "Problem with expressionTrees; see https://github.com/DotNetAnalyzers/IDisposableAnalyzers/issues/370")]
211201
public async Task WriteMultipleCallsUnderlyingWriteMethodAsync()
212202
{
213203
// Arrange

0 commit comments

Comments
 (0)