Skip to content

Commit b61b9a7

Browse files
angularsentmilnthorp
authored andcommitted
Fix msbuild warnings, re-enable and treat all as errors (#617)
* Remove <NoWarn> from projects * Merge partial of BaseUnits * R#: Add "Gullberg" to dictionary * Obsolete Molarity.FromDensity() * Add xmldoc to fix msbuild warnings Mute some compiler warnings * Treat compiler warning as error for all projects
1 parent 95a3a32 commit b61b9a7

File tree

146 files changed

+2815
-397
lines changed

Some content is hidden

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

146 files changed

+2815
-397
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Serialization.JsonNet.CompatibilityTests</RootNamespace>
66
<LangVersion>7.3</LangVersion>
7+
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
78
</PropertyGroup>
89

910
<ItemGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Serialization.JsonNet.Tests</RootNamespace>
66
<LangVersion>7.3</LangVersion>
7+
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
78
</PropertyGroup>
89

910
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<PropertyGroup>
2121
<AssemblyVersion>4.0.0.0</AssemblyVersion> <!-- Should reflect major part of Version -->
2222
<LangVersion>7.3</LangVersion>
23-
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>
2423
<RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
2524
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
25+
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
2626
</PropertyGroup>
2727

2828
<!-- SourceLink -->

UnitsNet.Tests/CustomCode/MolarityTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void ExpectDensityConvertedToMolarityCorrectly()
4242
{
4343
var density = Density.FromKilogramsPerCubicMeter(60.02);
4444
var mw = Mass.FromGrams(58.443);
45-
var molarity = Molarity.FromDensity(density, mw).MolesPerCubicMeter;
45+
var molarity = (density / mw).MolesPerCubicMeter;
4646
AssertEx.EqualTolerance(1026.98355, molarity, MolesPerCubicMeterTolerance);
4747
}
4848

UnitsNet.Tests/QuantityInfoTest.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ public void Constructor_AssignsProperties()
2424

2525
Assert.Equal(expectedZero, info.Zero);
2626
Assert.Equal("Length", info.Name);
27+
// Obsolete members
28+
#pragma warning disable 618
2729
Assert.Equal(expectedUnits, info.Units);
2830
Assert.Equal(expectedBaseUnit, info.BaseUnit);
2931
Assert.Equal(new[]{"Centimeter", "Kilometer"}, info.UnitNames);
32+
#pragma warning restore 618
3033
Assert.Equal(expectedQuantityType, info.QuantityType);
3134
Assert.Equal(expectedBaseDimensions, info.BaseDimensions);
3235
}
@@ -44,9 +47,12 @@ public void GenericsConstructor_AssignsProperties()
4447

4548
Assert.Equal(expectedZero, info.Zero);
4649
Assert.Equal("Length", info.Name);
50+
// Obsolete members
51+
#pragma warning disable 618
4752
Assert.Equal(expectedUnits, info.Units);
4853
Assert.Equal(expectedBaseUnit, info.BaseUnit);
4954
Assert.Equal(new[]{"Centimeter", "Kilometer"}, info.UnitNames);
55+
#pragma warning restore 618
5056
Assert.Equal(expectedQuantityType, info.QuantityType);
5157
Assert.Equal(expectedBaseDimensions, info.BaseDimensions);
5258
}

UnitsNet.Tests/QuantityTest.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,13 @@ public void GetInfo_GivenLength_ReturnsQuantityInfoForLength()
5252

5353
Assert.Equal("Length", quantityInfo.Name);
5454
Assert.Equal(QuantityType.Length, quantityInfo.QuantityType);
55+
// Obsolete members
56+
#pragma warning disable 618
5557
Assert.Superset(knownLengthUnitNames.ToHashSet(), quantityInfo.UnitNames.ToHashSet());
5658
Assert.Superset(knownLengthUnits.ToHashSet(), quantityInfo.Units.ToHashSet());
5759
Assert.Equal(lengthUnitCount, quantityInfo.UnitNames.Length);
5860
Assert.Equal(lengthUnitCount, quantityInfo.Units.Length);
61+
#pragma warning restore 618
5962
Assert.Equal(typeof(LengthUnit), quantityInfo.UnitType);
6063
Assert.Equal(typeof(Length), quantityInfo.ValueType);
6164
Assert.Equal(Length.Zero, quantityInfo.Zero);
@@ -72,10 +75,13 @@ public void GetInfo_GivenMass_ReturnsQuantityInfoForMass()
7275

7376
Assert.Equal("Mass", quantityInfo.Name);
7477
Assert.Equal(QuantityType.Mass, quantityInfo.QuantityType);
78+
// Obsolete members
79+
#pragma warning disable 618
7580
Assert.Superset(knownMassUnitNames.ToHashSet(), quantityInfo.UnitNames.ToHashSet());
7681
Assert.Superset(knownMassUnits.ToHashSet(), quantityInfo.Units.ToHashSet());
7782
Assert.Equal(massUnitCount, quantityInfo.UnitNames.Length);
7883
Assert.Equal(massUnitCount, quantityInfo.Units.Length);
84+
#pragma warning restore 618
7985
Assert.Equal(typeof(MassUnit), quantityInfo.UnitType);
8086
Assert.Equal(typeof(Mass), quantityInfo.ValueType);
8187
Assert.Equal(Mass.Zero, quantityInfo.Zero);

UnitsNet.Tests/QuantityTests.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@ private static void AssertQuantityInfoRepresentsLength(QuantityInfo<LengthUnit>
4040
{
4141
Assert.Equal(Length.Zero, quantityInfo.Zero);
4242
Assert.Equal("Length", quantityInfo.Name);
43-
44-
var lengthUnits = EnumUtils.GetEnumValues<LengthUnit>().Except(new[] {LengthUnit.Undefined}).ToArray();
45-
Assert.Equal(lengthUnits, quantityInfo.Units);
4643
Assert.Equal(QuantityType.Length, quantityInfo.QuantityType);
4744

45+
var lengthUnits = EnumUtils.GetEnumValues<LengthUnit>().Except(new[] {LengthUnit.Undefined}).ToArray();
4846
var lengthUnitNames = lengthUnits.Select(x => x.ToString());
47+
48+
// Obsolete members
49+
#pragma warning disable 618
50+
Assert.Equal(lengthUnits, quantityInfo.Units);
4951
Assert.Equal(lengthUnitNames, quantityInfo.UnitNames);
52+
#pragma warning restore 618
5053
}
5154
}
5255
}

UnitsNet.Tests/UnitsNet.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Tests</RootNamespace>
6-
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>
76
<LangVersion>7.3</LangVersion>
7+
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
88
</PropertyGroup>
99

1010
<ItemGroup>
@@ -25,4 +25,4 @@
2525
<ProjectReference Include="..\UnitsNet\UnitsNet.csproj" />
2626
</ItemGroup>
2727

28-
</Project>
28+
</Project>

UnitsNet.WindowsRuntimeComponent/UnitsNet.WindowsRuntimeComponent.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
2020
<OutputPath>..\Artifacts\UnitsNet.WindowsRuntimeComponent</OutputPath>
21-
<NoWarn>CS1701;CS1702;CS1705;CS0618;CS0809;CS1591</NoWarn>
2221
<LangVersion>7.3</LangVersion>
2322

2423
<!-- SourceLink -->
@@ -135,4 +134,4 @@
135134
<Target Name="AfterBuild">
136135
</Target>
137136
-->
138-
</Project>
137+
</Project>

UnitsNet.sln.DotSettings

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
1717
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
1818
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
19-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
19+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
20+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gullberg/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)