Skip to content

Commit b2eabf3

Browse files
OleRossOleRoss
committed
Merge remote-tracking branch 'refs/remotes/upstream/master' into annotate-is-native-aot-compatible
2 parents c0dde6a + d2648d7 commit b2eabf3

File tree

185 files changed

+5387
-1149
lines changed

Some content is hidden

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

185 files changed

+5387
-1149
lines changed

‎Build/build-pack-nano-nugets.psm1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function Invoke-BuildNanoNugets {
2525
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Angle\UnitsNet.NanoFramework.Angle.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2626
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\MagneticField\UnitsNet.NanoFramework.MagneticField.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2727
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Acceleration\UnitsNet.NanoFramework.Acceleration.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
28+
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Level\UnitsNet.NanoFramework.Level.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2829

2930
}
3031

‎Build/bump-version-json.sh‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set_version_script="$script_dir/set-version-UnitsNet.Serialization.JsonNet.ps1"
55

66
names=(major minor patch suffix);
77
if [[ " "${names[@]}" " == *" "$1" "* ]] ;then
8-
powershell -NoProfile $set_version_script -bump $1
8+
pwsh -NoProfile $set_version_script -bump $1
99
exit 0
1010
else
1111
echo "Usage: ./bump-version-json.sh <major|minor|patch|suffix>"

‎Build/bump-version.sh‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set_version_script="$script_dir/set-version-UnitsNet.ps1"
55

66
names=(major minor patch suffix);
77
if [[ " "${names[@]}" " == *" "$1" "* ]] ;then
8-
powershell -NoProfile $set_version_script -bump $1
8+
pwsh -NoProfile $set_version_script -bump $1
99
exit 0
1010
else
1111
echo "Usage: ./bump-version.sh <major|minor|patch|suffix>"

‎Build/codecov.sh‎

100644100755
File mode changed.

‎Build/set-version-json.sh‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
44
set_version_script="$script_dir/set-version-UnitsNet.Serialization.JsonNet.ps1"
55

66
if [ $# -eq 1 ]; then
7-
powershell -NoProfile $set_version_script -setVersion $1
7+
pwsh -NoProfile $set_version_script -setVersion $1
88
exit 0
99
else
1010
echo "Usage: ./set-version-json.sh <version>"

‎Build/set-version.sh‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
44
set_version_script="$script_dir/set-version-UnitsNet.ps1"
55

66
if [ $# -eq 1 ]; then
7-
powershell -NoProfile $set_version_script -setVersion $1
7+
pwsh -NoProfile $set_version_script -setVersion $1
88
exit 0
99
else
1010
echo "Usage: ./set-version.sh <version>"

‎CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ private void GenerateRelationalOperators()
736736
/// <returns>The corresponding inverse quantity, <see cref=""{relation.RightQuantity.Name}""/>.</returns>
737737
public {relation.RightQuantity.Name} Inverse()
738738
{{
739-
return {relation.LeftUnit.PluralName} == 0.0 ? {relation.RightQuantity.Name}.Zero : {relation.RightQuantity.Name}.From{relation.RightUnit.PluralName}(1 / {relation.LeftUnit.PluralName});
739+
return {relation.RightQuantity.Name}.From{relation.RightUnit.PluralName}(1 / {relation.LeftUnit.PluralName});
740740
}}
741741
");
742742
}

‎Common/UnitDefinitions/AreaMomentOfInertia.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Localization": [
1818
{
1919
"Culture": "en-US",
20-
"Abbreviations": [ "m⁴", "m^4" ]
20+
"Abbreviations": [ "m⁴" ]
2121
}
2222
]
2323
},
@@ -32,7 +32,7 @@
3232
"Localization": [
3333
{
3434
"Culture": "en-US",
35-
"Abbreviations": [ "dm⁴", "dm^4" ]
35+
"Abbreviations": [ "dm⁴" ]
3636
}
3737
]
3838
},
@@ -47,7 +47,7 @@
4747
"Localization": [
4848
{
4949
"Culture": "en-US",
50-
"Abbreviations": [ "cm⁴", "cm^4" ]
50+
"Abbreviations": [ "cm⁴" ]
5151
}
5252
]
5353
},
@@ -62,7 +62,7 @@
6262
"Localization": [
6363
{
6464
"Culture": "en-US",
65-
"Abbreviations": [ "mm⁴", "mm^4" ]
65+
"Abbreviations": [ "mm⁴" ]
6666
}
6767
]
6868
},
@@ -77,7 +77,7 @@
7777
"Localization": [
7878
{
7979
"Culture": "en-US",
80-
"Abbreviations": [ "ft⁴", "ft^4" ]
80+
"Abbreviations": [ "ft⁴" ]
8181
}
8282
]
8383
},
@@ -92,7 +92,7 @@
9292
"Localization": [
9393
{
9494
"Culture": "en-US",
95-
"Abbreviations": [ "in⁴", "in^4" ]
95+
"Abbreviations": [ "in⁴" ]
9696
}
9797
]
9898
}

‎Common/UnitDefinitions/Density.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"Localization": [
7777
{
7878
"Culture": "en-US",
79-
"Abbreviations": [ "lb/in³" ],
79+
"Abbreviations": [ "lb/in³", "lbm/in³" ],
8080
"AbbreviationsForPrefixes": { "Kilo": "kip/in³" }
8181
}
8282
]
@@ -94,7 +94,7 @@
9494
"Localization": [
9595
{
9696
"Culture": "en-US",
97-
"Abbreviations": [ "lb/ft³" ],
97+
"Abbreviations": [ "lb/ft³", "lbm/ft³" ],
9898
"AbbreviationsForPrefixes": { "Kilo": "kip/ft³" }
9999
}
100100
]
@@ -113,7 +113,7 @@
113113
"Localization": [
114114
{
115115
"Culture": "en-US",
116-
"Abbreviations": [ "lb/yd³" ],
116+
"Abbreviations": [ "lb/yd³", "lbm/yd³" ],
117117
"AbbreviationsForPrefixes": { "Kilo": "kip/yd³" }
118118
}
119119
]
@@ -345,7 +345,7 @@
345345
"Localization": [
346346
{
347347
"Culture": "en-US",
348-
"Abbreviations": [ "lb/m³" ]
348+
"Abbreviations": [ "lb/m³", "lbm/m³" ]
349349
}
350350
]
351351
},
@@ -361,7 +361,7 @@
361361
"Localization": [
362362
{
363363
"Culture": "en-US",
364-
"Abbreviations": [ "lb/cm³" ]
364+
"Abbreviations": [ "lb/cm³", "lbm/cm³" ]
365365
}
366366
]
367367
},
@@ -377,7 +377,7 @@
377377
"Localization": [
378378
{
379379
"Culture": "en-US",
380-
"Abbreviations": [ "lb/mm³" ]
380+
"Abbreviations": [ "lb/mm³", "lbm/mm³" ]
381381
}
382382
]
383383
},

‎Common/UnitDefinitions/Entropy.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"Localization": [
5757
{
5858
"Culture": "en-US",
59-
"Abbreviations": [ "J/C" ]
59+
"Abbreviations": [ "J/°C" ]
6060
}
6161
]
6262
}

0 commit comments

Comments
 (0)