Skip to content

Commit 62c00f3

Browse files
committed
Upgrade test projects to net5.0
Fix compile errors on CS8073. Fix tests on argument null exception message.
1 parent 59d980c commit 62c00f3

File tree

114 files changed

+329
-115
lines changed

Some content is hidden

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

114 files changed

+329
-115
lines changed

CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,8 @@ public void EqualityOperators()
371371
var a = {_quantity.Name}.From{_baseUnit.PluralName}(1);
372372
var b = {_quantity.Name}.From{_baseUnit.PluralName}(2);
373373
374-
// ReSharper disable EqualExpressionComparison
374+
#pragma warning disable CS8073
375+
// ReSharper disable EqualExpressionComparison
375376
376377
Assert.True(a == a);
377378
Assert.False(a != a);
@@ -383,6 +384,7 @@ public void EqualityOperators()
383384
Assert.False(null == a);
384385
385386
// ReSharper restore EqualExpressionComparison
387+
#pragma warning restore CS8073
386388
}}
387389
388390
[Fact]

UnitsNet.NumberExtensions.Tests/UnitsNet.NumberExtensions.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.NumberExtensions.Tests</RootNamespace>
66
<LangVersion>latest</LangVersion>
77
<IsTestProject>true</IsTestProject>

UnitsNet.Serialization.JsonNet.CompatibilityTests/UnitsNet.Serialization.JsonNet.CompatibilityTests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Serialization.JsonNet.CompatibilityTests</RootNamespace>
66
<LangVersion>latest</LangVersion>
77
<IsTestProject>true</IsTestProject>

UnitsNet.Serialization.JsonNet.Tests/UnitsNet.Serialization.JsonNet.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Serialization.JsonNet.Tests</RootNamespace>
66
<LangVersion>latest</LangVersion>
77
<IsTestProject>true</IsTestProject>

UnitsNet.Serialization.JsonNet.Tests/UnitsNetBaseJsonConverterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void UnitsNetBaseJsonConverter_ConvertIQuantity_throws_ArgumentNullExcept
4444
{
4545
var result = Assert.Throws<ArgumentNullException>(() => _sut.Test_ConvertDoubleIQuantity(null));
4646

47-
Assert.Equal($"Value cannot be null.{Environment.NewLine}Parameter name: quantity", result.Message);
47+
Assert.Equal("Value cannot be null. (Parameter 'quantity')", result.Message);
4848
}
4949

5050
[Fact]

UnitsNet.Serialization.JsonNet.Tests/UnitsNetIComparableJsonConverterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void UnitsNetIComparableJsonConverter_ReadJson_throws_ArgumentNullExcepti
4949
{
5050
var exception = Assert.Throws<ArgumentNullException>(() => _sut.ReadJson(reader, typeof(IQuantity), null, false, serializer));
5151

52-
Assert.Equal($"Value cannot be null.{Environment.NewLine}Parameter name: {paramName}", exception.Message);
52+
Assert.Equal($"Value cannot be null. (Parameter '{paramName}')", exception.Message);
5353
}
5454

5555
[Fact]

UnitsNet.Serialization.JsonNet.Tests/UnitsNetIQuantityJsonConverterTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void
3939
{
4040
var exception = Assert.Throws<ArgumentNullException>(() => _sut.WriteJson(writer, Power.FromWatts(10D), serializer));
4141

42-
Assert.Equal($"Value cannot be null.{Environment.NewLine}Parameter name: {parameterName}", exception.Message);
42+
Assert.Equal($"Value cannot be null. (Parameter '{parameterName}')", exception.Message);
4343
}
4444

4545
[Fact]
@@ -104,7 +104,7 @@ public void UnitsNetIQuantityJsonConverter_ReadJson_throws_ArgumentNullException
104104
{
105105
var exception = Assert.Throws<ArgumentNullException>(() => _sut.ReadJson(reader, typeof(IQuantity), null, false, serializer));
106106

107-
Assert.Equal($"Value cannot be null.{Environment.NewLine}Parameter name: {paramName}", exception.Message);
107+
Assert.Equal($"Value cannot be null. (Parameter '{paramName}')", exception.Message);
108108
}
109109

110110
[Fact]

UnitsNet.Tests/GeneratedCode/TestsBase/AccelerationTestsBase.g.cs

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.Tests/GeneratedCode/TestsBase/AmountOfSubstanceTestsBase.g.cs

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.Tests/GeneratedCode/TestsBase/AmplitudeRatioTestsBase.g.cs

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)