Merge remote-tracking branch 'refs/remotes/upstream/master' into annotate-is-native-aot-compatible

Author: OleRoss

Build/build-pack-nano-nugets.psm1

@@ -25,6 +25,7 @@ function Invoke-BuildNanoNugets {
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Angle\UnitsNet.NanoFramework.Angle.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\MagneticField\UnitsNet.NanoFramework.MagneticField.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Acceleration\UnitsNet.NanoFramework.Acceleration.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
+  & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Level\UnitsNet.NanoFramework.Level.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir" 
 
 }
 

Build/bump-version-json.sh

@@ -5,7 +5,7 @@ set_version_script="$script_dir/set-version-UnitsNet.Serialization.JsonNet.ps1"
 
 names=(major minor patch suffix);
 if [[ " "${names[@]}" " == *" "$1" "* ]] ;then
-    powershell -NoProfile $set_version_script -bump $1
+    pwsh -NoProfile $set_version_script -bump $1
     exit 0
 else
     echo "Usage: ./bump-version-json.sh <major|minor|patch|suffix>"

Build/bump-version.sh

@@ -5,7 +5,7 @@ set_version_script="$script_dir/set-version-UnitsNet.ps1"
 
 names=(major minor patch suffix);
 if [[ " "${names[@]}" " == *" "$1" "* ]] ;then
-    powershell -NoProfile $set_version_script -bump $1
+    pwsh -NoProfile $set_version_script -bump $1
     exit 0
 else
     echo "Usage: ./bump-version.sh <major|minor|patch|suffix>"

Build/codecov.sh

@@ -4,7 +4,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 set_version_script="$script_dir/set-version-UnitsNet.Serialization.JsonNet.ps1"
 
 if [ $# -eq 1 ]; then
-    powershell -NoProfile $set_version_script -setVersion $1
+    pwsh -NoProfile $set_version_script -setVersion $1
     exit 0
 else
     echo "Usage: ./set-version-json.sh <version>"

Build/set-version-json.sh

@@ -4,7 +4,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 set_version_script="$script_dir/set-version-UnitsNet.ps1"
 
 if [ $# -eq 1 ]; then
-    powershell -NoProfile $set_version_script -setVersion $1
+    pwsh -NoProfile $set_version_script -setVersion $1
     exit 0
 else
     echo "Usage: ./set-version.sh <version>"

Build/set-version.sh

@@ -736,7 +736,7 @@ private void GenerateRelationalOperators()
         /// <returns>The corresponding inverse quantity, <see cref=""{relation.RightQuantity.Name}""/>.</returns>
         public {relation.RightQuantity.Name} Inverse()
         {{
-            return {relation.LeftUnit.PluralName} == 0.0 ? {relation.RightQuantity.Name}.Zero : {relation.RightQuantity.Name}.From{relation.RightUnit.PluralName}(1 / {relation.LeftUnit.PluralName});
+            return {relation.RightQuantity.Name}.From{relation.RightUnit.PluralName}(1 / {relation.LeftUnit.PluralName});
         }}
 ");
                 }

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -17,7 +17,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "m⁴", "m^4" ]
+          "Abbreviations": [ "m⁴" ]
         }
       ]
     },
@@ -32,7 +32,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "dm⁴", "dm^4" ]
+          "Abbreviations": [ "dm⁴" ]
         }
       ]
     },
@@ -47,7 +47,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "cm⁴", "cm^4" ]
+          "Abbreviations": [ "cm⁴" ]
         }
       ]
     },
@@ -62,7 +62,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "mm⁴", "mm^4" ]
+          "Abbreviations": [ "mm⁴" ]
         }
       ]
     },
@@ -77,7 +77,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "ft⁴", "ft^4" ]
+          "Abbreviations": [ "ft⁴" ]
         }
       ]
     },
@@ -92,7 +92,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "in⁴", "in^4" ]
+          "Abbreviations": [ "in⁴" ]
         }
       ]
     }

Common/UnitDefinitions/AreaMomentOfInertia.json

@@ -76,7 +76,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/in³" ],
+          "Abbreviations": [ "lb/in³", "lbm/in³" ],
           "AbbreviationsForPrefixes": { "Kilo": "kip/in³" }
         }
       ]
@@ -94,7 +94,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/ft³" ],
+          "Abbreviations": [ "lb/ft³", "lbm/ft³" ],
           "AbbreviationsForPrefixes": { "Kilo": "kip/ft³" }
         }
       ]
@@ -113,7 +113,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/yd³" ],
+          "Abbreviations": [ "lb/yd³", "lbm/yd³" ],
           "AbbreviationsForPrefixes": { "Kilo": "kip/yd³" }
         }
       ]
@@ -345,7 +345,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/m³" ]
+          "Abbreviations": [ "lb/m³", "lbm/m³" ]
         }
       ]
     },
@@ -361,7 +361,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/cm³" ]
+          "Abbreviations": [ "lb/cm³", "lbm/cm³" ]
         }
       ]
     },
@@ -377,7 +377,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "lb/mm³" ]
+          "Abbreviations": [ "lb/mm³", "lbm/mm³" ]
         }
       ]
     },

Common/UnitDefinitions/Density.json

@@ -56,7 +56,7 @@
       "Localization": [
         {
           "Culture": "en-US",
-          "Abbreviations": [ "J/C" ]
+          "Abbreviations": [ "J/°C" ]
         }
       ]
     }