Merge branch 'master' into master

Author: angularsen

CodeGen/CodeGen.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="NuGet.Protocol" Version="6.2.2" />
+    <PackageReference Include="NuGet.Protocol" Version="6.2.4" />
     <PackageReference Include="Serilog" Version="2.11.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.2.0-alpha.19174.3" />

CodeGen/Generators/NanoFrameworkGen/NuspecGenerator.cs

@@ -25,7 +25,7 @@ public string Generate()
 <package xmlns=""http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"">
   <metadata>
     <id>UnitsNet.nanoFramework.{_quantity.Name}</id>
-    <version>5.16.0</version>
+    <version>5.20.0</version>
     <title>Units.NET {_quantity.Name} - nanoFramework</title>
     <authors>Andreas Gullberg Larsen,nanoFramework project contributors</authors>
     <owners>UnitsNet</owners>

Common/UnitDefinitions/AbsorbedDoseOfIonizingRadiation.json

@@ -0,0 +1,54 @@
+{
+  "Name": "AbsorbedDoseOfIonizingRadiation",
+  "BaseUnit": "Gray",
+  "XmlDocSummary": "Absorbed dose is a dose quantity which is the measure of the energy deposited in matter by ionizing radiation per unit mass.",
+  "XmlDocRemarks": "https://en.wikipedia.org/wiki/Absorbed_dose",
+  "BaseDimensions": {
+    "L": 2,
+    "T": -2
+  },
+  "Units": [
+    {
+      "SingularName": "Gray",
+      "PluralName": "Grays",
+      "BaseUnits": {
+        "L": "Meter",
+        "T": "Second"
+      },
+      "FromUnitToBaseFunc": "{x}",
+      "FromBaseToUnitFunc": "{x}",
+      "XmlDocSummary": "The gray is the unit of ionizing radiation dose in the SI, defined as the absorption of one joule of radiation energy per kilogram of matter.",
+      "XmlDocRemarks": "https://en.wikipedia.org/wiki/Gray_(unit)",
+      "Prefixes": [ "Femto", "Pico", "Nano", "Micro", "Milli", "Centi", "Kilo", "Mega", "Giga", "Tera", "Peta" ],
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "Gy" ]
+        },
+        {
+          "Culture": "ru-RU",
+          "Abbreviations": [ "Гр" ]
+        }
+      ]
+    },
+    {
+      "SingularName": "Rad",
+      "PluralName": "Rads",
+      "FromUnitToBaseFunc": "{x} / 100",
+      "FromBaseToUnitFunc": "{x} * 100",
+      "XmlDocSummary": "The rad is a unit of absorbed radiation dose, defined as 1 rad = 0.01 Gy = 0.01 J/kg.",
+      "XmlDocRemarks": "https://en.wikipedia.org/wiki/Rad_(radiation_unit)",
+      "Prefixes": [ "Milli", "Kilo", "Mega" ],
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "rad" ]
+        },
+        {
+          "Culture": "ru-RU",
+          "Abbreviations": [ "рад" ]
+        }
+      ]
+    }
+  ]
+}

Common/UnitDefinitions/Volume.json

@@ -78,7 +78,7 @@
         }
       ]
     },
-	  {
+    {
       "SingularName": "CubicDecimeter",
       "PluralName": "CubicDecimeters",
       "FromUnitToBaseFunc": "{x} / 1e3",
@@ -461,6 +461,18 @@
         }
       ]
     },
+    {
+      "SingularName": "ImperialQuart",
+      "PluralName": "ImperialQuarts",
+      "FromUnitToBaseFunc": "{x} * 1.1365225e-3",
+      "FromBaseToUnitFunc": "{x} / 1.1365225e-3",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "qt (imp.)" ]
+        }
+      ]
+    },
     {
       "SingularName": "UsPint",
       "PluralName": "UsPints",

Common/UnitEnumValues.g.json

@@ -1567,7 +1567,8 @@
     "UsQuart": 50,
     "UsTablespoon": 51,
     "UsTeaspoon": 52,
-    "Nanoliter": 53
+    "Nanoliter": 53,
+    "ImperialQuart": 57
   },
   "VolumeConcentration": {
     "CentilitersPerLiter": 1,
@@ -1755,5 +1756,23 @@
     "PascalQubicMeterPerSecond": 1,
     "TorrLiterPerSecond": 4,
     "PascalCubicMeterPerSecond": 2
+  },
+  "AbsorbedDoseOfIonizingRadiation": {
+    "Centigray": 6,
+    "Femtogray": 7,
+    "Gigagray": 8,
+    "Gray": 5,
+    "Kilogray": 9,
+    "Kilorad": 4,
+    "Megagray": 3,
+    "Megarad": 2,
+    "Microgray": 1,
+    "Milligray": 10,
+    "Millirad": 18,
+    "Nanogray": 16,
+    "Petagray": 19,
+    "Picogray": 11,
+    "Rad": 17,
+    "Teragray": 14
   }
 }

README.md

@@ -12,24 +12,23 @@ No more magic constants found on Stack Overflow, no more second-guessing the uni
 
 ### Overview
 
-* [How to install](#how-to-install)
-* [100+ quantities with 1400+ units](UnitsNet/GeneratedCode/Units) generated from [JSON](Common/UnitDefinitions/) by [C# CLI app](CodeGen)
-* [30k unit tests](https://dev.azure.com/unitsnet/Units.NET/_build?definitionId=1)
-* [Statically typed quantities and units](#static-typing) to avoid mistakes and communicate intent
-* Immutable structs
-* [Operator overloads](#operator-overloads) for arithmetic
-* [Parse and ToString()](#culture) supports localization
-* [Dynamically parse and convert](#dynamic-parsing) quantities and units
-* [Extensible with custom units](#custom-units)
-* [Example: Creating a unit converter app](#example-app)
-* [Example: WPF app using IValueConverter to parse quantities from input](#example-wpf-app-using-ivalueconverter-to-parse-quantities-from-input)
-* [Precision and accuracy](#precision)
-* [Serialize to JSON, XML and more](#serialization)
-* [Contribute](#contribute) if you are missing some units
-* [Continuous integration](#ci) posts status reports to pull requests and commits
-* [Who are using this?](#who-are-using)
-
-### <a name="how-to-install"></a>Installing via NuGet
+* [Overview](#overview)
+* [Installing via NuGet](#installing-via-nuget)
+* [Static Typing](#static-typing)
+* [Operator Overloads](#operator-overloads)
+* [Culture and Localization](#culture-and-localization)
+* [Dynamically Parse Quantities and Convert to Units](#dynamically-parse-quantities-and-convert-to-units)
+* [Custom units](#custom-units)
+* [Example: Unit converter app](#example-unit-converter-app)
+* [Example: WPF app using IValueConverter to parse input](#example-wpf-app-using-ivalueconverter-to-parse-input)
+* [Precision and Accuracy](#precision-and-accuracy)
+* [Serialize to JSON, XML and more](#serialize-to-json-xml-and-more)
+* [Want To Contribute?](#want-to-contribute)
+* [Continuous Integration](#continuous-integration)
+* [Who are Using This?](#who-are-using-this)
+* [Units.NET on other platforms](#unitsnet-on-other-platforms)
+
+### Installing via NuGet
 
 Add it via CLI
 
@@ -43,7 +42,7 @@ or go to [NuGet Gallery | UnitsNet](https://www.nuget.org/packages/UnitsNet) for
 * .NET Standard 2.0
 * [.NET nanoFramework](https://www.nanoframework.net/)
 
-### <a name="static-typing"></a>Static Typing
+### Static Typing
 
 ```C#
 // Construct
@@ -67,7 +66,7 @@ string PrintPersonWeight(Mass weight)
 }
 ```
 
-### <a name="operator-overloads"></a>Operator Overloads
+### Operator Overloads
 
 ```C#
 // Arithmetic
@@ -82,7 +81,7 @@ Acceleration a2 = Force.FromNewtons(100) / Mass.FromKilograms(20);
 RotationalSpeed r = Angle.FromDegrees(90) / TimeSpan.FromSeconds(2);
 ```
 
-### <a name="culture"></a>Culture and Localization
+### Culture and Localization
 
 The culture for abbreviations defaults to Thread.CurrentCulture and falls back to US English if not defined. Thread.CurrentCulture affects number formatting unless a custom culture is specified. The relevant methods are:
 
@@ -122,7 +121,7 @@ Unfortunately there is no built-in way to avoid this, either you need to ensure
 Example:
 `Length.Parse("1 pt")` throws `AmbiguousUnitParseException` with message `Cannot parse "pt" since it could be either of these: DtpPoint, PrinterPoint`.
 
-### <a name="dynamic-parsing"></a>Dynamically Parse Quantities and Convert to Units
+### Dynamically Parse Quantities and Convert to Units
 Sometimes you need to work with quantities and units at runtime, such as parsing user input.
 
 There are a handful of classes to help with this:
@@ -169,6 +168,16 @@ if (Quantity.TryFrom(3, LengthUnit.Centimeter, out IQuantity quantity2))
 {
 }
 ```
+
+You can also construct from strings, such as mapping between DTO types in an API:
+```c#
+IQuantity quantity = Quantity.From(value: 3, quantityName: "Length", unitName: "Centimeter");
+
+if (Quantity.TryFrom(value: 3, quantityName: "Length", unitName: "Centimeter", out IQuantity? quantity2))
+{
+}
+```
+
 #### Parse quantity
 Parse any string to a quantity instance of the given the quantity type.
 
@@ -222,7 +231,7 @@ UnitConverter.ConvertByName(1, "Length", "Centimeter", "Millimeter"); // 10 mm
 UnitConverter.ConvertByAbbreviation(1, "Length", "cm", "mm"); // 10 mm
 ```
 
-### <a name="custom-units"></a>Custom units
+### Custom units
 
 Units.NET allows you to add your own units and quantities at runtime, to represent as `IQuantity` and reusing Units.NET for parsing and converting between units.
 
@@ -252,7 +261,7 @@ Console.WriteLine(Convert(HowMuchUnit.Lots)); // 100 lts
 Console.WriteLine(Convert(HowMuchUnit.Tons)); // 10 tns
 ```
 
-### <a name="example-app"></a>Example: Unit converter app
+### Example: Unit converter app
 [Source code](https://github.com/angularsen/UnitsNet/tree/master/Samples/UnitConverter.Wpf) for `Samples/UnitConverter.Wpf`<br/>
 [Download](https://github.com/angularsen/UnitsNet/releases/tag/UnitConverterWpf%2F2018-11-09) (release 2018-11-09 for Windows)
 
@@ -291,15 +300,15 @@ double convertedValue = UnitConverter.Convert(
     SelectedToUnit.UnitEnumValue);  // Enum, such as LengthUnit.Centimeter
 ```
 
-### Example: WPF app using IValueConverter to parse quantities from input
+### Example: WPF app using IValueConverter to parse input
 
 Src: [Samples/WpfMVVMSample](https://github.com/angularsen/UnitsNet/tree/master/Samples/WpfMVVMSample)
 
 ![wpfmvvmsample_219w](https://user-images.githubusercontent.com/787816/34913417-094332e2-f8fd-11e7-9d8a-92db105fbbc9.png)
 
 The purpose of this app is to show how to create an `IValueConverter` in order to bind XAML to quantities.
 
-### <a name="precision"></a>Precision and Accuracy
+### Precision and Accuracy
 
 A base unit is chosen for each unit class, represented by a double value (64-bit), and all conversions go via this unit. This means that there will always be a small error in both representing other units than the base unit as well as converting between units.
 
@@ -309,28 +318,24 @@ The tests accept an error up to 1E-5 for most units added so far. Exceptions inc
 
 For more details, see [Precision](https://github.com/angularsen/UnitsNet/wiki/Precision).
 
-### <a name="serialization"></a>Serialize to JSON, XML and more
-
-* [UnitsNet.Serialization.JsonNet](https://www.nuget.org/packages/UnitsNet.Serialization.JsonNet) with Json.NET (Newtonsoft)
-* [DataContractSerializer](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.serialization.datacontractserializer) XML
-* [DataContractJsonSerializer](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.serialization.json.datacontractjsonserializer) JSON (not recommended*)
+### Serialize to JSON, XML and more
 
-Read more at [Serializing to JSON, XML and more](https://github.com/angularsen/UnitsNet/wiki/Serializing-to-JSON,-XML-and-more).
+Read the wiki on [Serializing to JSON, XML and more](https://github.com/angularsen/UnitsNet/wiki/Serializing-to-JSON,-XML-and-more).
 
 
-### <a name="contribute"></a>Want To Contribute?
+### Want To Contribute?
 
 - [Adding a New Unit](https://github.com/angularsen/UnitsNet/wiki/Adding-a-New-Unit) is fairly easy to do and we are happy to help.
 - Want a new feature or to report a bug? [Create an issue](https://github.com/angularsen/UnitsNet/issues/new/choose) or start a [discussion](https://github.com/angularsen/UnitsNet/discussions).
 
-### <a name="ci"></a>Continuous Integration
+### Continuous Integration
 
 [AppVeyor](https://ci.appveyor.com/project/angularsen/unitsnet) performs the following:
 * Build and test all branches
 * Build and test pull requests, notifies on success or error
 * Deploy nugets on master branch, if nuspec versions changed
 
-### <a name="who-are-using"></a>Who are Using This?
+### Who are Using This?
 
 It would be awesome to know who are using this library. If you would like your project listed here, [create an issue](https://github.com/angularsen/UnitsNet/issues) or edit the [README.md](https://github.com/angularsen/UnitsNet/edit/master/README.md) and send a pull request. Max logo size is `300x35 pixels` and should be in `.png`, `.gif` or `.jpg` formats.
 
@@ -411,7 +416,7 @@ https://github.com/StructuralAnalysisFormat/StructuralAnalysisFormat-SDK
 
 *- Dirk Schuermans, Software Engineer for [SCIA nv](https://www.scia.net)*
 
-## Units.NET on other platforms
+### Units.NET on other platforms
 
 Get the same strongly typed units on other platforms, based on the same [unit definitions](/Common/UnitDefinitions).
 

UnitsNet.NanoFramework/GeneratedCode/AbsorbedDoseOfIonizingRadiation/AbsorbedDoseOfIonizingRadiation.nfproj

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
+  </PropertyGroup>
+  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{3d39134e-c97d-cba4-a559-fdb3a0da5e54}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <RootNamespace>UnitsNet</RootNamespace>
+    <AssemblyName>UnitsNet.AbsorbedDoseOfIonizingRadiation</AssemblyName>
+    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
+  <ItemGroup>
+    <Compile Include="..\Quantities\AbsorbedDoseOfIonizingRadiation.g.cs" />
+    <Compile Include="..\Units\AbsorbedDoseOfIonizingRadiationUnit.g.cs" />
+    <Compile Include="..\Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
+      <Private>True</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
+  <ProjectExtensions>
+    <ProjectCapabilities>
+      <ProjectConfigurationsDeclaredAsItems />
+    </ProjectCapabilities>
+  </ProjectExtensions>
+</Project>

UnitsNet.NanoFramework/GeneratedCode/AbsorbedDoseOfIonizingRadiation/UnitsNet.NanoFramework.AbsorbedDoseOfIonizingRadiation.nuspec

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>UnitsNet.nanoFramework.AbsorbedDoseOfIonizingRadiation</id>
+    <version>5.20.0</version>
+    <title>Units.NET AbsorbedDoseOfIonizingRadiation - nanoFramework</title>
+    <authors>Andreas Gullberg Larsen,nanoFramework project contributors</authors>
+    <owners>UnitsNet</owners>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/angularsen/UnitsNet</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Adds AbsorbedDoseOfIonizingRadiation units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead.</description>
+    <iconUrl>https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</iconUrl>
+    <releaseNotes>
+    </releaseNotes>
+    <copyright>Copyright 2013 Andreas Gullberg Larsen ([email protected]).</copyright>
+    <language>en-US</language>
+    <tags>nanoframework absorbeddoseofionizingradiation unit units quantity quantities measurement si metric imperial abbreviation abbreviations convert conversion parse immutable</tags>
+    <dependencies>
+      <dependency id="nanoFramework.CoreLibrary" version="1.14.2" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\Artifacts\UnitsNet.NanoFramework\AbsorbedDoseOfIonizingRadiation\UnitsNet.*" target="lib" />
+  </files>
+</package>

UnitsNet.NanoFramework/GeneratedCode/AbsorbedDoseOfIonizingRadiation/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnanoframework10" />
+</packages>

UnitsNet.NanoFramework/GeneratedCode/Acceleration/UnitsNet.NanoFramework.Acceleration.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>UnitsNet.nanoFramework.Acceleration</id>
-    <version>5.16.0</version>
+    <version>5.20.0</version>
     <title>Units.NET Acceleration - nanoFramework</title>
     <authors>Andreas Gullberg Larsen,nanoFramework project contributors</authors>
     <owners>UnitsNet</owners>