Skip to content

Commit 89188eb

Browse files
committed
Merge branch 'fix-build-warnings'
2 parents 34ef070 + 536fe6e commit 89188eb

File tree

126 files changed

+8093
-8074
lines changed

Some content is hidden

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

126 files changed

+8093
-8074
lines changed

UnitsNet.Serialization.JsonNet/UnitsNetJsonConverter.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
22
// https://github.com/angularsen/UnitsNet
3-
//
3+
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files (the "Software"), to deal
66
// in the Software without restriction, including without limitation the rights
77
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
88
// copies of the Software, and to permit persons to whom the Software is
99
// furnished to do so, subject to the following conditions:
10-
//
10+
//
1111
// The above copyright notice and this permission notice shall be included in
1212
// all copies or substantial portions of the Software.
13-
//
13+
//
1414
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1515
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1616
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,6 +26,7 @@
2626
using Newtonsoft.Json;
2727
using Newtonsoft.Json.Linq;
2828
using UnitsNet.InternalHelpers;
29+
using UnitsNet.Units;
2930

3031
namespace UnitsNet.Serialization.JsonNet
3132
{
@@ -130,7 +131,7 @@ private static object CreateQuantity(Type quantityType, double value, object uni
130131

131132
// Ex: Mass.From(55, MassUnit.Gram)
132133
// TODO: there is a possible loss of precision if base value requires higher precision than double can represent.
133-
// Example: Serializing Information.FromExabytes(100) then deserializing to Information
134+
// Example: Serializing Information.FromExabytes(100) then deserializing to Information
134135
// will likely return a very different result. Not sure how we can handle this?
135136
return notNullableFromMethod.Invoke(null, new[] {quantityValue, unitValue});
136137
}
@@ -196,7 +197,7 @@ public override void WriteJson(JsonWriter writer, object obj, JsonSerializer ser
196197
TypeNameHandling = serializer.TypeNameHandling,
197198
};
198199
JToken t = JToken.FromObject(obj, localSerializer);
199-
200+
200201
t.WriteTo(writer);
201202
return;
202203
}

UnitsNet/AssemblyInfo.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
22
// https://github.com/angularsen/UnitsNet
3-
//
3+
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files (the "Software"), to deal
66
// in the Software without restriction, including without limitation the rights
77
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
88
// copies of the Software, and to permit persons to whom the Software is
99
// furnished to do so, subject to the following conditions:
10-
//
10+
//
1111
// The above copyright notice and this permission notice shall be included in
1212
// all copies or substantial portions of the Software.
13-
//
13+
//
1414
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1515
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1616
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,5 +20,4 @@
2020
// THE SOFTWARE.
2121

2222
using System;
23-
using System.Runtime.CompilerServices;
2423
[assembly: CLSCompliant(true)]

UnitsNet/CustomCode/Quantities/AmplitudeRatio.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using System;
2323
using UnitsNet.Units;
2424

25+
// ReSharper disable once CheckNamespace
2526
namespace UnitsNet
2627
{
2728
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

UnitsNet/CustomCode/Quantities/Angle.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#endif
2626

27+
// ReSharper disable once CheckNamespace
2728
namespace UnitsNet
2829
{
2930
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

UnitsNet/CustomCode/Quantities/Area.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
// THE SOFTWARE.
2121

22+
// ReSharper disable once CheckNamespace
2223
namespace UnitsNet
2324
{
2425
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

UnitsNet/CustomCode/Quantities/BrakeSpecificFuelConsumption.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
// THE SOFTWARE.
2121

22+
// ReSharper disable once CheckNamespace
2223
namespace UnitsNet
2324
{
2425
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

UnitsNet/CustomCode/Quantities/Density.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
// THE SOFTWARE.
2121

22+
// ReSharper disable once CheckNamespace
2223
namespace UnitsNet
2324
{
2425
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

UnitsNet/CustomCode/Quantities/Duration.extra.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
22
// https://github.com/angularsen/UnitsNet
3-
//
3+
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files (the "Software"), to deal
66
// in the Software without restriction, including without limitation the rights
77
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
88
// copies of the Software, and to permit persons to whom the Software is
99
// furnished to do so, subject to the following conditions:
10-
//
10+
//
1111
// The above copyright notice and this permission notice shall be included in
1212
// all copies or substantial portions of the Software.
13-
//
13+
//
1414
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1515
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1616
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,6 +21,7 @@
2121

2222
using System;
2323

24+
// ReSharper disable once CheckNamespace
2425
namespace UnitsNet
2526
{
2627
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
@@ -133,4 +134,4 @@ public TimeSpan ToTimeSpan()
133134
return TimeSpan.FromSeconds(Seconds);
134135
}
135136
}
136-
}
137+
}

UnitsNet/CustomCode/Quantities/DynamicViscosity.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
// THE SOFTWARE.
2121

22+
// ReSharper disable once CheckNamespace
2223
namespace UnitsNet
2324
{
2425
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

UnitsNet/CustomCode/Quantities/Force.extra.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
// THE SOFTWARE.
2121

22+
// ReSharper disable once CheckNamespace
2223
namespace UnitsNet
2324
{
2425
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components

0 commit comments

Comments
 (0)