Merge remote-tracking branch 'upstream/master'

mludlum · mludlum · commit b4c78f497bb2 · 2017-01-16T10:13:36.000-05:00
diff --git a/Build/UnitsNet.Signed.nuspec b/Build/UnitsNet.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>UnitsNet.Signed</id>
-    <version>3.48.1</version>
+    <version>3.49.0</version>
     <title>Units.NET (signed)</title>
     <authors>Andreas Gullberg Larsen</authors>
     <owners>Andreas Gullberg Larsen</owners>
@@ -22,4 +22,4 @@
     <file src="Artifacts\Bin\Src-signed\AnyCPU_Release\**\UnitsNet.dll" target="lib" />
     <file src="UnitsNet\**\*.cs" exclude="UnitsNet\**\obj\**\*.cs" target="src" />
   </files>
-</package>
+</package>
diff --git a/Build/UnitsNet.WindowsRuntimeComponent.nuspec b/Build/UnitsNet.WindowsRuntimeComponent.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>UnitsNet.WindowsRuntimeComponent</id>
-    <version>3.48.0</version>
+    <version>3.49.0</version>
     <title>Units.NET - Windows Runtime Component</title>
     <authors>Andreas Gullberg Larsen</authors>
     <owners>Andreas Gullberg Larsen</owners>
@@ -22,4 +22,4 @@
     <file src="Artifacts\Bin\Src-unsigned\AnyCPU_Release\uap10.0\UnitsNet.*" target="lib/uap10.0" />
     <file src="UnitsNet\**\*.cs" exclude="UnitsNet\**\obj\**\*.cs" target="src" />
   </files>
-</package>
+</package>
diff --git a/Build/UnitsNet.nuspec b/Build/UnitsNet.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>UnitsNet</id>
-    <version>3.48.0</version>
+    <version>3.49.0</version>
     <title>Units.NET</title>
     <authors>Andreas Gullberg Larsen</authors>
     <owners>Andreas Gullberg Larsen</owners>
@@ -22,4 +22,4 @@
     <file src="Artifacts\Bin\Src-unsigned\AnyCPU_Release\**\UnitsNet.dll" target="lib" />
     <file src="UnitsNet\**\*.cs" exclude="UnitsNet\**\obj\**\*.cs" target="src" />
   </files>
-</package>
+</package>
diff --git a/UnitsNet.Tests/CustomCode/PressureTests.cs b/UnitsNet.Tests/CustomCode/PressureTests.cs
@@ -59,7 +59,7 @@ public class PressureTests : PressureTestsBase
 
         protected override double PoundsForcePerSquareFootInOnePascal => 0.0208854342;
 
-        protected override double PoundsForcePerSquareInchInOnePascal => 0.000145037738;
+        protected override double PoundsForcePerSquareInchInOnePascal => 0.000145037737730209;
 
         protected override double PsiInOnePascal => 1.450377*1E-4;
 
diff --git a/UnitsNet/GeneratedCode/Enums/PressureUnit.g.cs b/UnitsNet/GeneratedCode/Enums/PressureUnit.g.cs
@@ -69,6 +69,7 @@ public enum PressureUnit
         Pascal,
         PoundForcePerSquareFoot,
         PoundForcePerSquareInch,
+        [System.Obsolete("Deprecated due to github issue #215, please use PoundForcePerSquareInch instead")]
         Psi,
         TechnicalAtmosphere,
         TonneForcePerSquareCentimeter,
diff --git a/UnitsNet/GeneratedCode/UnitClasses/Pressure.g.cs b/UnitsNet/GeneratedCode/UnitClasses/Pressure.g.cs
@@ -243,7 +243,7 @@ public double KilopoundsForcePerSquareFoot
         /// </summary>
         public double KilopoundsForcePerSquareInch
         {
-            get { return (_pascals*0.000145037725185479) / 1e3d; }
+            get { return (_pascals*0.000145037737730209) / 1e3d; }
         }
 
         /// <summary>
@@ -323,12 +323,13 @@ public double PoundsForcePerSquareFoot
         /// </summary>
         public double PoundsForcePerSquareInch
         {
-            get { return _pascals*0.000145037725185479; }
+            get { return _pascals*0.000145037737730209; }
         }
 
         /// <summary>
         ///     Get Pressure in Psi.
         /// </summary>
+        [System.Obsolete("Deprecated due to github issue #215, please use PoundForcePerSquareInch instead")]
         public double Psi
         {
             get { return _pascals/(6.89464975179*1e3); }
@@ -516,7 +517,7 @@ public static Pressure FromKilopoundsForcePerSquareFoot(double kilopoundsforcepe
         /// </summary>
         public static Pressure FromKilopoundsForcePerSquareInch(double kilopoundsforcepersquareinch)
         {
-            return new Pressure((kilopoundsforcepersquareinch*6894.75788951576) * 1e3d);
+            return new Pressure((kilopoundsforcepersquareinch*6894.75729316836) * 1e3d);
         }
 
         /// <summary>
@@ -596,7 +597,7 @@ public static Pressure FromPoundsForcePerSquareFoot(double poundsforcepersquaref
         /// </summary>
         public static Pressure FromPoundsForcePerSquareInch(double poundsforcepersquareinch)
         {
-            return new Pressure(poundsforcepersquareinch*6894.75788951576);
+            return new Pressure(poundsforcepersquareinch*6894.75729316836);
         }
 
         /// <summary>
diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs
@@ -1598,7 +1598,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                         new CulturesForEnumValue((int) PressureUnit.PoundForcePerSquareInch,
                             new[]
                             {
-                                new AbbreviationsForCulture("en-US", "lb/in²"),
+                                new AbbreviationsForCulture("en-US", "psi", "lb/in²"),
                             }),
                         new CulturesForEnumValue((int) PressureUnit.Psi,
                             new[]
diff --git a/UnitsNet/Scripts/UnitDefinitions/Pressure.json b/UnitsNet/Scripts/UnitDefinitions/Pressure.json
@@ -162,6 +162,7 @@
     {
       "SingularName": "Psi",
       "PluralName": "Psi",
+      "ObsoleteText": "Deprecated due to github issue #215, please use PoundForcePerSquareInch instead",      
       "FromUnitToBaseFunc": "x*6.89464975179*1e3",
       "FromBaseToUnitFunc": "x/(6.89464975179*1e3)",
       "Localization": [
@@ -210,13 +211,13 @@
     {
       "SingularName": "PoundForcePerSquareInch",
       "PluralName": "PoundsForcePerSquareInch",
-      "FromUnitToBaseFunc": "x*6894.75788951576",
-      "FromBaseToUnitFunc": "x*0.000145037725185479",
+      "FromUnitToBaseFunc": "x*6894.75729316836",
+      "FromBaseToUnitFunc": "x*0.000145037737730209",
       "Prefixes": [ "Kilo" ],
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/in²" ],
+          "Abbreviations": [ "psi", "lb/in²" ],
           "AbbreviationsWithPrefixes": [ "kipf/in²" ]
         }
       ]

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public double KilopoundsForcePerSquareFoot`
`243`	`243`	`/// </summary>`
`244`	`244`	`public double KilopoundsForcePerSquareInch`
`245`	`245`	`{`
`246`		`- get { return (_pascals*0.000145037725185479) / 1e3d; }`
	`246`	`+ get { return (_pascals*0.000145037737730209) / 1e3d; }`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`/// <summary>`
`@@ -323,12 +323,13 @@ public double PoundsForcePerSquareFoot`
`323`	`323`	`/// </summary>`
`324`	`324`	`public double PoundsForcePerSquareInch`
`325`	`325`	`{`
`326`		`- get { return _pascals*0.000145037725185479; }`
	`326`	`+ get { return _pascals*0.000145037737730209; }`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`/// <summary>`
`330`	`330`	`/// Get Pressure in Psi.`
`331`	`331`	`/// </summary>`
	`332`	`+ [System.Obsolete("Deprecated due to github issue #215, please use PoundForcePerSquareInch instead")]`
`332`	`333`	`public double Psi`
`333`	`334`	`{`
`334`	`335`	`get { return _pascals/(6.89464975179*1e3); }`
`@@ -516,7 +517,7 @@ public static Pressure FromKilopoundsForcePerSquareFoot(double kilopoundsforcepe`
`516`	`517`	`/// </summary>`
`517`	`518`	`public static Pressure FromKilopoundsForcePerSquareInch(double kilopoundsforcepersquareinch)`
`518`	`519`	`{`
`519`		`- return new Pressure((kilopoundsforcepersquareinch6894.75788951576) 1e3d);`
	`520`	`+ return new Pressure((kilopoundsforcepersquareinch6894.75729316836) 1e3d);`
`520`	`521`	`}`
`521`	`522`
`522`	`523`	`/// <summary>`
`@@ -596,7 +597,7 @@ public static Pressure FromPoundsForcePerSquareFoot(double poundsforcepersquaref`
`596`	`597`	`/// </summary>`
`597`	`598`	`public static Pressure FromPoundsForcePerSquareInch(double poundsforcepersquareinch)`
`598`	`599`	`{`
`599`		`- return new Pressure(poundsforcepersquareinch*6894.75788951576);`
	`600`	`+ return new Pressure(poundsforcepersquareinch*6894.75729316836);`
`600`	`601`	`}`
`601`	`602`
`602`	`603`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization`
`1598`	`1598`	`new CulturesForEnumValue((int) PressureUnit.PoundForcePerSquareInch,`
`1599`	`1599`	`new[]`
`1600`	`1600`	`{`
`1601`		`- new AbbreviationsForCulture("en-US", "lb/in²"),`
	`1601`	`+ new AbbreviationsForCulture("en-US", "psi", "lb/in²"),`
`1602`	`1602`	`}),`
`1603`	`1603`	`new CulturesForEnumValue((int) PressureUnit.Psi,`
`1604`	`1604`	`new[]`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@`
`162`	`162`	`{`
`163`	`163`	`"SingularName": "Psi",`
`164`	`164`	`"PluralName": "Psi",`
	`165`	`+ "ObsoleteText": "Deprecated due to github issue #215, please use PoundForcePerSquareInch instead",`
`165`	`166`	`"FromUnitToBaseFunc": "x6.894649751791e3",`
`166`	`167`	`"FromBaseToUnitFunc": "x/(6.89464975179*1e3)",`
`167`	`168`	`"Localization": [`
`@@ -210,13 +211,13 @@`
`210`	`211`	`{`
`211`	`212`	`"SingularName": "PoundForcePerSquareInch",`
`212`	`213`	`"PluralName": "PoundsForcePerSquareInch",`
`213`		`- "FromUnitToBaseFunc": "x*6894.75788951576",`
`214`		`- "FromBaseToUnitFunc": "x*0.000145037725185479",`
	`214`	`+ "FromUnitToBaseFunc": "x*6894.75729316836",`
	`215`	`+ "FromBaseToUnitFunc": "x*0.000145037737730209",`
`215`	`216`	`"Prefixes": [ "Kilo" ],`
`216`	`217`	`"Localization": [`
`217`	`218`	`{`
`218`	`219`	`"Culture": "en-US",`
`219`		`- "Abbreviations": [ "lb/in²" ],`
	`220`	`+ "Abbreviations": [ "psi", "lb/in²" ],`
`220`	`221`	`"AbbreviationsWithPrefixes": [ "kipf/in²" ]`
`221`	`222`	`}`
`222`	`223`	`]`