Skip to content

Commit 867a489

Browse files
RoogRoog
authored
Merge pull request #1 from sverigesradio/dev/bumpingversions
Dev/bumpingversions
2 parents 1495bcb + 6f368fc commit 867a489

33 files changed

+448
-648
lines changed

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>net48;netstandard2.1;net6.0</TargetFrameworks>
55
<Description></Description>
66
<Company>Lawo GmbH</Company>
77
<Copyright>Copyright 2012-2020 Lawo GmbH (http://www.lawo.com). Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)</Copyright>
@@ -12,29 +12,18 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<Compile Remove="Properties\AssemblyInfo.cs" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
15+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
2016
<PrivateAssets>all</PrivateAssets>
2117
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2218
</PackageReference>
2319
</ItemGroup>
2420

2521
<ItemGroup>
26-
<None Include="packages.config">
27-
<SubType>Designer</SubType>
28-
</None>
2922
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json">
3023
<Link>stylecop.json</Link>
3124
</AdditionalFiles>
3225
</ItemGroup>
3326

34-
<ItemGroup>
35-
<Folder Include="Properties\" />
36-
</ItemGroup>
37-
3827
<ItemGroup>
3928
<ProjectReference Include="..\Lawo\Lawo.csproj" />
4029
</ItemGroup>

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharp/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Runtime.InteropServices;
1010

1111
// General
12-
[assembly: AssemblyTitle("Lawo.EmberPlusSharp")]
12+
//[assembly: AssemblyTitle("Lawo.EmberPlusSharp")]
1313
[assembly: AssemblyDescription("")]
1414

1515
// CA enforced

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharp/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharpTest/Ember/CompatibilityTest.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class CompatibilityTest : TestBase
2424
[TestMethod]
2525
public void BooleanTest()
2626
{
27-
var value = this.Random.Next(0, 2) == 1;
27+
var value = Random.Shared.Next(0, 2) == 1;
2828
this.AssertEqual((w, i, v) => w.WriteValue(i, v), r => r.GetBoolean(), value);
2929
this.AssertEqual((w, t, v) => w.Write(t, v), r => r.ReadContentsAsBoolean(), value);
3030
}
@@ -34,7 +34,7 @@ public void BooleanTest()
3434
public void IntegerTest()
3535
{
3636
var longBytes = new byte[Marshal.SizeOf(typeof(long))];
37-
this.Random.NextBytes(longBytes);
37+
Random.Shared.NextBytes(longBytes);
3838
var value = BitConverter.ToInt64(longBytes, 0);
3939

4040
this.AssertEqual((w, i, v) => w.WriteValue(i, v), r => r.GetLong(), value);
@@ -46,7 +46,7 @@ public void IntegerTest()
4646
public void OctetstringTest()
4747
{
4848
var value = new byte[1024];
49-
this.Random.NextBytes(value);
49+
Random.Shared.NextBytes(value);
5050
this.CollectionAssertEqual((w, i, v) => w.WriteValue(i, v), r => r.GetOctetString(), value);
5151
this.CollectionAssertEqual((w, t, v) => w.Write(t, v), r => r.ReadContentsAsByteArray(), value);
5252
}
@@ -55,7 +55,7 @@ public void OctetstringTest()
5555
[TestMethod]
5656
public void RealTest()
5757
{
58-
var value = (this.Random.NextDouble() - 0.5) * this.Random.Next(int.MaxValue);
58+
var value = (Random.Shared.NextDouble() - 0.5) * Random.Shared.Next(int.MaxValue);
5959
this.AssertEqual((w, i, v) => w.WriteValue(i, v), r => r.GetReal(), value);
6060
this.AssertEqual((w, t, v) => w.Write(t, v), r => r.ReadContentsAsDouble(), value);
6161
}
@@ -82,11 +82,11 @@ public void Utf8StringTest()
8282
[TestMethod]
8383
public void RelativeObjectIdentifierTest()
8484
{
85-
var value = new int[this.Random.Next(0, 16)];
85+
var value = new int[Random.Shared.Next(0, 16)];
8686

8787
for (int index = 0; index < value.Length; ++index)
8888
{
89-
value[index] = this.Random.Next();
89+
value[index] = Random.Shared.Next();
9090
}
9191

9292
this.CollectionAssertEqual((w, i, v) => w.WriteValue(i, v), r => r.GetRelativeOid(), value);
@@ -138,7 +138,7 @@ private void CollectionAssertEqual<T>(
138138
private void AssertEqual<T>(
139139
Action<EmberWriter, EmberId, T> write, Func<EmberLib.EmberReader, T> read, T value, Action<T, T> assertEqual)
140140
{
141-
var number = this.Random.Next();
141+
var number = Random.Shared.Next();
142142
var outer = EmberId.CreateApplication(number);
143143
var tag = new BerTag(BerClass.Application, (uint)number);
144144

@@ -160,7 +160,7 @@ private void AssertEqual<T>(
160160
private void AssertEqual<T>(
161161
Action<EmberLib.EmberWriter, BerTag, T> write, Func<EmberReader, T> read, T value, Action<T, T> assertEqual)
162162
{
163-
var number = this.Random.Next();
163+
var number = Random.Shared.Next();
164164
var outerId = EmberId.CreateApplication(number);
165165
var tag = new BerTag(BerClass.Application, (uint)number);
166166

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharpTest/Ember/EmberConverterTest.cs

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ public class EmberConverterTest : TestBase
2828
[TestMethod]
2929
public void ExceptionTest()
3030
{
31-
AssertThrow<ArgumentNullException>(
32-
() => new EmberType(null).Ignore(),
33-
() => new EmberTypeBag(null).Ignore(),
34-
() => new EmberConverter(null).Ignore());
31+
Assert.ThrowsException<ArgumentNullException>(() => new EmberType(null).Ignore());
32+
Assert.ThrowsException<ArgumentNullException>(() => new EmberTypeBag(null).Ignore());
33+
Assert.ThrowsException<ArgumentNullException>(() => new EmberConverter(null).Ignore());
3534

36-
AssertThrow<ArgumentException>(() => new EmberType().Ignore());
35+
Assert.ThrowsException<ArgumentException>(() => new EmberType().Ignore());
3736

3837
using (var stream = new MemoryStream())
3938
using (var reader = new EmberReader(stream))
4039
using (var writer = XmlWriter.Create(new StringBuilder()))
4140
{
4241
var converter = new EmberConverter();
43-
AssertThrow<ArgumentNullException>(
44-
() => converter.ToXml((byte[])null, writer),
45-
() => converter.ToXml(new byte[0], null),
46-
() => converter.ToXml((EmberReader)null, writer),
47-
() => converter.ToXml(reader, null));
42+
Assert.ThrowsException<ArgumentNullException>(() => converter.ToXml((byte[]) null, writer));
43+
Assert.ThrowsException<ArgumentNullException>(() => converter.ToXml(new byte[0], null));
44+
Assert.ThrowsException<ArgumentNullException>(() => converter.ToXml((EmberReader) null, writer));
45+
Assert.ThrowsException<ArgumentNullException>(() => converter.ToXml(reader, null));
4846
}
4947

5048
using (var stringReader = new StringReader(string.Empty))
@@ -53,10 +51,9 @@ public void ExceptionTest()
5351
using (var writer = new EmberWriter(stream))
5452
{
5553
var converter = new EmberConverter();
56-
AssertThrow<ArgumentNullException>(
57-
() => converter.FromXml(null),
58-
() => converter.FromXml(null, writer),
59-
() => converter.FromXml(reader, null));
54+
Assert.ThrowsException<ArgumentNullException>(() => converter.FromXml(null));
55+
Assert.ThrowsException<ArgumentNullException>(() => converter.FromXml(null, writer));
56+
Assert.ThrowsException<ArgumentNullException>(() => converter.FromXml(reader, null));
6057
}
6158

6259
AssertXmlException("<whatever type=\"A-11\"></whatever>", "Unknown field path: whatever.");

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharpTest/Ember/EmberReaderTest.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void SkipContentsTest()
4848
}
4949

5050
var original = new byte[64];
51-
this.Random.NextBytes(original);
51+
Random.Shared.NextBytes(original);
5252
byte[] encoded;
5353

5454
using (var stream = new MemoryStream())
@@ -109,14 +109,14 @@ public void ShortOctetstringTest()
109109
{
110110
AssertDecode(new byte[0]);
111111
AssertDecode(this.Randomize(new byte[1]));
112-
AssertDecode(this.Randomize(new byte[this.Random.Next(126)]));
112+
AssertDecode(this.Randomize(new byte[Random.Shared.Next(126)]));
113113
}
114114

115115
/// <summary>Tests Octetstring contents with lengths &gt;= 128.</summary>
116116
[TestMethod]
117117
public void LongOctetstringTest()
118118
{
119-
var contents = new byte[this.Random.Next(128, 253)];
119+
var contents = new byte[Random.Shared.Next(128, 253)];
120120
this.Randomize(contents);
121121

122122
var header =
@@ -167,11 +167,11 @@ public void RelativeObjectIdentifierTest()
167167
{
168168
AssertDecode(new int[] { });
169169

170-
var relativeObjectIdentifier = new int[this.Random.Next(32)];
170+
var relativeObjectIdentifier = new int[Random.Shared.Next(32)];
171171

172172
for (int index = 0; index < relativeObjectIdentifier.Length; ++index)
173173
{
174-
relativeObjectIdentifier[index] = this.Random.Next(128);
174+
relativeObjectIdentifier[index] = Random.Shared.Next(128);
175175
}
176176

177177
AssertDecode(relativeObjectIdentifier);
@@ -185,10 +185,10 @@ public void ContainerTest()
185185
reader =>
186186
{
187187
Assert.IsFalse(reader.CanReadContents);
188-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsObject());
188+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsObject());
189189
Assert.IsTrue(reader.Read());
190190
Assert.AreEqual(InnerNumber.EndContainer, reader.InnerNumber);
191-
AssertThrow<InvalidOperationException>(() => reader.OuterId.Ignore());
191+
Assert.ThrowsException<InvalidOperationException>(() => reader.OuterId.Ignore());
192192
};
193193

194194
AssertDecode(InnerNumber.Sequence, assertEqual, 0x60, 0x80, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00);
@@ -205,14 +205,14 @@ public void ExceptionTest()
205205
{
206206
TestStandardExceptionConstructors<EmberException>();
207207

208-
AssertThrow<ArgumentNullException>(() => new EmberReader(null, 1).Dispose());
208+
Assert.ThrowsException<ArgumentNullException>(() => new EmberReader(null, 1).Dispose());
209209
AssertEmberException("Incorrect length at position 3.", 0x60, 0x03, 0x0D, 0x01, 0xFF, 0x00);
210210

211211
using (var stream = new MemoryStream(new byte[] { 0x60, 0x03, 0x01, 0x01, 0xFF }))
212212
using (var reader = new EmberReader(stream, 1))
213213
{
214214
reader.Read();
215-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsString());
215+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsString());
216216
reader.ReadContentsAsBoolean();
217217
}
218218

@@ -411,22 +411,22 @@ private static void AssertDecode(int expectedInnerNumber, Action<EmberReader> as
411411
using (var stream = new MemoryStream(input))
412412
using (var reader = new EmberReader(stream, 1))
413413
{
414-
AssertThrow<InvalidOperationException>(() => reader.InnerNumber.GetHashCode().Ignore());
415-
AssertThrow<InvalidOperationException>(() => reader.OuterId.Ignore());
416-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsObject());
414+
Assert.ThrowsException<InvalidOperationException>(() => reader.InnerNumber.GetHashCode().Ignore());
415+
Assert.ThrowsException<InvalidOperationException>(() => reader.OuterId.Ignore());
416+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsObject());
417417
Assert.IsFalse(reader.CanReadContents);
418418
Assert.IsTrue(reader.Read());
419419
Assert.AreEqual(EmberId.CreateApplication(0), reader.OuterId);
420420
Assert.AreEqual(expectedInnerNumber, reader.InnerNumber);
421421
assertEqual(reader);
422-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsObject());
422+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsObject());
423423
Assert.IsFalse(reader.Read());
424424

425425
reader.Dispose();
426426
Assert.IsFalse(reader.CanReadContents);
427-
AssertThrow<ObjectDisposedException>(() => reader.InnerNumber.Ignore());
428-
AssertThrow<ObjectDisposedException>(() => reader.OuterId.Ignore());
429-
AssertThrow<ObjectDisposedException>(() => reader.ReadContentsAsObject());
427+
Assert.ThrowsException<ObjectDisposedException>(() => reader.InnerNumber.Ignore());
428+
Assert.ThrowsException<ObjectDisposedException>(() => reader.OuterId.Ignore());
429+
Assert.ThrowsException<ObjectDisposedException>(() => reader.ReadContentsAsObject());
430430
}
431431

432432
using (var writer = XmlWriter.Create(Console.Out, new XmlWriterSettings() { Indent = true }))
@@ -460,15 +460,15 @@ private static void ReadAll(params byte[] input)
460460
switch (reader.InnerNumber)
461461
{
462462
case InnerNumber.EndContainer:
463-
AssertThrow<InvalidOperationException>(() => reader.OuterId.Ignore());
463+
Assert.ThrowsException<InvalidOperationException>(() => reader.OuterId.Ignore());
464464
Assert.IsFalse(reader.CanReadContents);
465-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsObject());
465+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsObject());
466466
break;
467467
case InnerNumber.Sequence:
468468
case InnerNumber.Set:
469469
reader.OuterId.Ignore();
470470
Assert.IsFalse(reader.CanReadContents);
471-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsObject());
471+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsObject());
472472
break;
473473
case InnerNumber.Boolean:
474474
case InnerNumber.Integer:
@@ -484,7 +484,7 @@ private static void ReadAll(params byte[] input)
484484
Assert.IsTrue(reader.InnerNumber >= InnerNumber.FirstApplication);
485485
reader.OuterId.Ignore();
486486
Assert.IsFalse(reader.CanReadContents);
487-
AssertThrow<InvalidOperationException>(() => reader.ReadContentsAsObject());
487+
Assert.ThrowsException<InvalidOperationException>(() => reader.ReadContentsAsObject());
488488
break;
489489
}
490490
}
@@ -493,7 +493,7 @@ private static void ReadAll(params byte[] input)
493493

494494
private byte[] Randomize(byte[] bytes)
495495
{
496-
this.Random.NextBytes(bytes);
496+
Random.Shared.NextBytes(bytes);
497497
return bytes;
498498
}
499499
}

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharpTest/Ember/EmberWriterTest.cs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,31 @@ public void MainTest()
7474
[TestMethod]
7575
public void ExceptionTest()
7676
{
77-
AssertThrow<ArgumentNullException>(() => new EmberWriter(null, 1).Dispose());
78-
AssertThrow<ArgumentException>(() => new EmberWriter(new MemoryStream(), 0).Dispose());
77+
Assert.ThrowsException<ArgumentNullException>(() => new EmberWriter(null, 1).Dispose());
78+
Assert.ThrowsException<ArgumentException>(() => new EmberWriter(new MemoryStream(), 0).Dispose());
7979

8080
using (var writer = new EmberWriter(new MemoryStream(), 1))
8181
{
8282
var outer = EmberId.CreateApplication(0);
8383

84-
AssertThrow<ArgumentNullException>(
85-
() => writer.WriteValue(outer, (byte[])null),
86-
() => writer.WriteValue(outer, (int[])null),
87-
() => writer.WriteValue(outer, (string)null));
84+
Assert.ThrowsException<ArgumentNullException>(() => writer.WriteValue(outer, (byte[]) null));
85+
Assert.ThrowsException<ArgumentNullException>(() => writer.WriteValue(outer, (int[]) null));
86+
Assert.ThrowsException<ArgumentNullException>(() => writer.WriteValue(outer, (string)null));
8887

89-
AssertThrow<ArgumentOutOfRangeException>(
88+
Assert.ThrowsException<ArgumentOutOfRangeException>(
9089
() => writer.WriteStartApplicationDefinedType(outer, InnerNumber.FirstApplication - 1));
9190

9291
writer.Dispose();
93-
AssertThrow<ObjectDisposedException>(
94-
() => writer.WriteValue(outer, true),
95-
() => writer.WriteValue(outer, 0),
96-
() => writer.WriteValue(outer, new byte[] { }),
97-
() => writer.WriteValue(outer, 0.0),
98-
() => writer.WriteValue(outer, string.Empty),
99-
() => writer.WriteValue(outer, new int[] { }),
100-
() => writer.WriteStartSequence(outer),
101-
() => writer.WriteStartSet(outer),
102-
() => writer.WriteStartApplicationDefinedType(outer, InnerNumber.FirstApplication),
103-
() => writer.WriteEndContainer());
92+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteValue(outer, true));
93+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteValue(outer, 0));
94+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteValue(outer, new byte[] { }));
95+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteValue(outer, 0.0));
96+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteValue(outer, string.Empty));
97+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteValue(outer, new int[] { }));
98+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteStartSequence(outer));
99+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteStartSet(outer));
100+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteStartApplicationDefinedType(outer, InnerNumber.FirstApplication));
101+
Assert.ThrowsException<ObjectDisposedException>(() => writer.WriteEndContainer());
104102
}
105103
}
106104

‎src/EmberLibConsumer.net/Lawo.EmberPlusSharpTest/Ember/IdentifierTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class IdentifierTest : TestBase
2121
public void MainTest()
2222
{
2323
var u1 = default(EmberId);
24-
var n1 = this.Random.Next();
24+
var n1 = Random.Shared.Next();
2525
var n2 = n1 + 1;
2626
var a1 = EmberId.CreateApplication(n1);
2727
var a2 = EmberId.CreateApplication(n2);
@@ -52,10 +52,10 @@ public void MainTest()
5252

5353
/// <summary>Tests <see cref="EmberId"/> exceptions.</summary>
5454
[TestMethod]
55-
public void ExceptionTest() =>
56-
AssertThrow<ArgumentOutOfRangeException>(
57-
() => EmberId.CreateApplication(-1),
58-
() => EmberId.CreateContextSpecific(-1));
55+
public void ExceptionTest() {
56+
Assert.ThrowsException<ArgumentOutOfRangeException>(() => EmberId.CreateApplication(-1));
57+
Assert.ThrowsException<ArgumentOutOfRangeException>(() => EmberId.CreateContextSpecific(-1));
58+
}
5959

6060
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
6161

0 commit comments

Comments
 (0)