Skip to content

Commit 4d89626

Browse files
committed
Merge remote-tracking branch 'origin/master' into release/v6
2 parents a4f5f51 + 0eff43e commit 4d89626

File tree

12 files changed

+103
-4
lines changed

12 files changed

+103
-4
lines changed

Build/build-pack-nano-nugets.psm1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function Invoke-BuildNanoNugets {
2121
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Power\UnitsNet.NanoFramework.Power.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2222
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Density\UnitsNet.NanoFramework.Density.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2323
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Mass\UnitsNet.NanoFramework.Mass.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
24+
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Speed\UnitsNet.NanoFramework.Speed.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2425
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\MassConcentration\UnitsNet.NanoFramework.MassConcentration.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2526
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Angle\UnitsNet.NanoFramework.Angle.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
2627
& $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\MagneticField\UnitsNet.NanoFramework.MagneticField.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"

Common/UnitDefinitions/Power.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@
111111
"Abbreviations": [ "J/h" ]
112112
}
113113
]
114+
},
115+
{
116+
"SingularName": "TonOfRefrigeration",
117+
"PluralName": "TonsOfRefrigeration",
118+
"FromUnitToBaseFunc": "{x} * 3516.853m",
119+
"FromBaseToUnitFunc": "{x} / 3516.853m",
120+
"Prefixes": [ ],
121+
"Localization": [
122+
{
123+
"Culture": "en-US",
124+
"Abbreviations": [ "TR" ]
125+
}
126+
]
114127
}
115128
]
116129
}

Common/UnitEnumValues.g.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,8 @@
10661066
"Petawatt": 23,
10671067
"Picowatt": 24,
10681068
"Terawatt": 25,
1069-
"Watt": 26
1069+
"Watt": 26,
1070+
"TonOfRefrigeration": 29
10701071
},
10711072
"PowerDensity": {
10721073
"DecawattPerCubicFoot": 1,

UnitsNet.NanoFramework/GeneratedCode/Quantities/Power.g.cs

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NanoFramework/GeneratedCode/Units/PowerUnit.g.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToPowerExtensionsTest.g.cs

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NumberExtensions/GeneratedCode/NumberToPowerExtensions.g.cs

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.Tests/CustomCode/PowerTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public class PowerTests : PowerTestsBase
2626

2727
protected override double DeciwattsInOneWatt => 1e1;
2828

29+
protected override decimal TonsOfRefrigerationInOneWatt => 2.8434512332474516279184828026648e-4m;
30+
2931
protected override double WattsInOneWatt => 1;
3032

3133
protected override double DecawattsInOneWatt => 1e-1;

UnitsNet.Tests/GeneratedCode/TestsBase/PowerTestsBase.g.cs

Lines changed: 40 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet/GeneratedCode/Quantities/Power.g.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)