Merge remote-tracking branch 'origin/master' into conversions

# Conflicts:
#	UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
#	UnitsNet/GeneratedCode/Quantities/Length.g.cs
#	UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
#	UnitsNet/GeneratedCode/Quantities/Power.g.cs
#	UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
#	UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
#	UnitsNet/GeneratedCode/Quantities/Speed.g.cs
#	UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs

Author: angularsen

.editorconfig

@@ -8,7 +8,6 @@ root = true
 [*]
 indent_style = space
 trim_trailing_whitespace = true
-trim_trailing_white_space_on_save = true
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
@@ -66,7 +65,7 @@ dotnet_style_explicit_tuple_names = true:suggestion
 # Prefer "var" everywhere
 csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_elsewhere = false:suggestion
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,75 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '34 11 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    
+    # .NET 6 is used in CodeGen project.
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

Build/build-pack-nano-nugets.psm1

@@ -19,6 +19,9 @@ function Invoke-Build-NanoNugets {
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\VolumeConcentration\UnitsNet.NanoFramework.VolumeConcentration.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Power\UnitsNet.NanoFramework.Power.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Density\UnitsNet.NanoFramework.Density.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
+  & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Mass\UnitsNet.NanoFramework.Mass.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
+  & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\MassConcentration\UnitsNet.NanoFramework.MassConcentration.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
+  & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Angle\UnitsNet.NanoFramework.Angle.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
 
 }
 

Build/init.ps1

@@ -23,29 +23,59 @@ if (!(Test-Path "$msbuildPath/nanoFramework")) {
   Write-Host "Installing .NET nanoFramework VS extension..."
 
   [System.Net.WebClient]$webClient = New-Object System.Net.WebClient
-  $webClient.UseDefaultCredentials = $true
+  $webClient.Headers.Add("User-Agent", "request")
+  $webClient.Headers.Add("Accept", "application/vnd.github.v3+json")
 
-  $vsixFeedXml = Join-Path -Path $tempDir -ChildPath "vs-extension-feed.xml"
-  $webClient.DownloadFile("http://vsixgallery.com/feed/author/nanoframework", $vsixFeedXml)
-  [xml]$feedDetails = Get-Content $vsixFeedXml
+  $releaseList = $webClient.DownloadString('https://api.github.com/repos/nanoframework/nf-Visual-Studio-extension/tags')
 
-  foreach ($entry in $feedDetails.feed.entry)
+  if($releaseList -match '"(?<VS2022_version>v2022\.\d+\.\d+\.\d+)')
   {
-      if($entry.id -eq '455f2be5-bb07-451e-b351-a9faf3018dc9')
-      {
-          $extensionUrl = $entry.content.src
-          $extensionVersion = $entry.Vsix.Version
-          break
-      }
+      $vs2022Tag =  $Matches.VS2022_version
   }
 
+  if($releaseList -match '"(?<VS2019_version>v2019\.\d+\.\d+\.\d+)')
+  {
+      $vs2019Tag =  $Matches.VS2019_version
+  }
+
+  # Find which VS version is installed
+  $VsWherePath = "${env:PROGRAMFILES(X86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+
+  Write-Output "VsWherePath is: $VsWherePath"
+
+  $VsInstance = $(&$VSWherePath -latest -property displayName)
+
+  Write-Output "Latest VS is: $VsInstance"
+
+  # Get extension details according to VS version, starting from VS2022 down to VS2019
+  if($vsInstance.Contains('2022'))
+  {
+      $extensionUrl = "https://github.com/nanoframework/nf-Visual-Studio-extension/releases/download/$vs2022Tag/nanoFramework.Tools.VS2022.Extension.vsix"
+      $vsixPath = Join-Path  $tempDir "nanoFramework.Tools.VS2022.Extension.zip"
+      $extensionVersion = $vs2022Tag
+  }
+  elseif($vsInstance.Contains('2019'))
+  {
+      $extensionUrl = "https://github.com/nanoframework/nf-Visual-Studio-extension/releases/download/$vs2019Tag/nanoFramework.Tools.VS2019.Extension.vsix"
+      $vsixPath = Join-Path  $tempDir "nanoFramework.Tools.VS2019.Extension.zip"
+      $extensionVersion = $vs2019Tag
+  }
+
+  Write-Output "Downloading visx..." -NoNewline
+
+  # download VS extension
+  Write-Debug "Download VSIX file from $extensionUrl to $vsixPath"
+  $webClient.DownloadFile($extensionUrl, $vsixPath)
+
+  $outputPath = "$tempDir\nf-extension"
+
   $vsixPath = Join-Path -Path $tempDir -ChildPath "nf-extension.zip"
   $webClient.DownloadFile($extensionUrl,$vsixPath)
-  Expand-Archive -LiteralPath $vsixPath -DestinationPath $tempDir\nf-extension\ | Write-Host
+  Expand-Archive -LiteralPath $vsixPath -DestinationPath $outputPath | Write-Host
 
-  Copy-Item -Path "$tempDir\nf-extension\`$MSBuild\nanoFramework" -Destination $msbuildPath -Recurse
+  Copy-Item -Path "$outputPath\`$MSBuild\nanoFramework" -Destination $msbuildPath -Recurse
 
-  Write-Host "Installed VS extension v$extensionVersion"
+  Write-Host "Installed VS extension $extensionVersion"
 }
 
 # Cleanup

CodeGen/CodeGen.csproj

@@ -11,9 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NuGet.Protocol" Version="5.9.1" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="NuGet.Protocol" Version="6.2.1" />
+    <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" />
   </ItemGroup>
 

CodeGen/Generators/NanoFrameworkGen/NuspecGenerator.cs

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

CodeGen/Generators/NanoFrameworkGen/UnitTypeGenerator.cs

@@ -1,4 +1,5 @@
 using CodeGen.Helpers;
+using CodeGen.Helpers.UnitEnumValueAllocation;
 using CodeGen.JsonTypes;
 
 namespace CodeGen.Generators.NanoFrameworkGen
@@ -7,11 +8,13 @@ namespace CodeGen.Generators.NanoFrameworkGen
     internal class UnitTypeGenerator : GeneratorBase
     {
         private readonly Quantity _quantity;
+        private readonly UnitEnumNameToValue _unitEnumNameToValue;
         private readonly string _unitEnumName;
 
-        public UnitTypeGenerator(Quantity quantity)
+        public UnitTypeGenerator(Quantity quantity, UnitEnumNameToValue unitEnumNameToValue)
         {
             _quantity = quantity;
+            _unitEnumNameToValue = unitEnumNameToValue;
             _unitEnumName = $"{quantity.Name}Unit";
         }
 
@@ -48,7 +51,7 @@ public enum {_unitEnumName}
 
                 Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit.ObsoleteText));
                 Writer.WL($@"
-        {unit.SingularName},");
+        {unit.SingularName} = {_unitEnumNameToValue[unit.SingularName]},");
             }
 
             Writer.WL($@"

CodeGen/Generators/NanoFrameworkGenerator.cs

@@ -6,6 +6,7 @@
 using System.Text.RegularExpressions;
 using CodeGen.Generators.NanoFrameworkGen;
 using CodeGen.Helpers;
+using CodeGen.Helpers.UnitEnumValueAllocation;
 using CodeGen.JsonTypes;
 using NuGet.Common;
 using Serilog;
@@ -40,7 +41,8 @@ internal static class NanoFrameworkGenerator
         /// </summary>
         /// <param name="rootDir">The root directory</param>
         /// <param name="quantities">The quantities to create</param>
-        public static void Generate(string rootDir, Quantity[] quantities)
+        /// <param name="quantityNameToUnitEnumValues"></param>
+        public static void Generate(string rootDir, Quantity[] quantities, QuantityNameToUnitEnumValues quantityNameToUnitEnumValues)
         {
             // get latest version of .NET nanoFramework mscorlib
             ILogger logger = NullLogger.Instance;
@@ -82,7 +84,9 @@ public static void Generate(string rootDir, Quantity[] quantities)
                     versions.MscorlibNugetVersion,
                     versions.MathNugetVersion);
 
-                GenerateUnitType(quantity, Path.Combine(outputUnits, $"{quantity.Name}Unit.g.cs"));
+                UnitEnumNameToValue unitEnumValues = quantityNameToUnitEnumValues[quantity.Name];
+
+                GenerateUnitType(quantity, Path.Combine(outputUnits, $"{quantity.Name}Unit.g.cs"), unitEnumValues);
                 GenerateQuantity(quantity, Path.Combine(outputQuantities, $"{quantity.Name}.g.cs"));
                 GenerateProject(quantity, Path.Combine(projectPath, $"{quantity.Name}.nfproj"), versions);
 
@@ -347,9 +351,9 @@ private static void GenerateProperties(string filePath, string version)
             Log.Information("✅ AssemblyInfo.cs (nanoFramework)");
         }
 
-        private static void GenerateUnitType(Quantity quantity, string filePath)
+        private static void GenerateUnitType(Quantity quantity, string filePath, UnitEnumNameToValue unitEnumValues)
         {
-            var content = new UnitTypeGenerator(quantity).Generate();
+            var content = new UnitTypeGenerator(quantity, unitEnumValues).Generate();
             File.WriteAllText(filePath, content);
         }
 

CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs

@@ -205,7 +205,7 @@ public void Ctor_SIUnitSystem_ThrowsArgumentExceptionIfNotSupported()
             Assert.Equal(""{_quantity.Name}"", quantityInfo.Name);
             Assert.Equal(QuantityType.{_quantity.Name}, quantityInfo.QuantityType);
 
-            var units = EnumUtils.GetEnumValues<{_unitEnumName}>().Except(new[] {{{_unitEnumName}.Undefined}}).ToArray();
+            var units = EnumUtils.GetEnumValues<{_unitEnumName}>().Except(new[] {{{_unitEnumName}.Undefined}}).OrderBy(x => x.ToString()).ToArray();
             var unitNames = units.Select(x => x.ToString());
 
             // Obsolete members
@@ -281,6 +281,84 @@ public void As_SIUnitSystem_ThrowsArgumentExceptionIfNotSupported()
             }}
         }}
 
+        [Fact]
+        public void Parse()
+        {{");
+            foreach(var unit in _quantity.Units.Where(u => string.IsNullOrEmpty(u.ObsoleteText)))
+            foreach(var localization in unit.Localization)
+            foreach(var abbreviation in localization.Abbreviations)
+            {
+                Writer.WL($@"
+            try
+            {{
+                var parsed = {_quantity.Name}.Parse(""1 {abbreviation}"", CultureInfo.GetCultureInfo(""{localization.Culture}""));
+                AssertEx.EqualTolerance(1, parsed.{unit.PluralName}, {unit.PluralName}Tolerance);
+                Assert.Equal({GetUnitFullName(unit)}, parsed.Unit);
+            }} catch (AmbiguousUnitParseException) {{ /* Some units have the same abbreviations */ }}
+");
+            }
+            Writer.WL($@"
+        }}
+
+        [Fact]
+        public void TryParse()
+        {{");
+            foreach(var unit in _quantity.Units.Where(u => string.IsNullOrEmpty(u.ObsoleteText)))
+            foreach(var localization in unit.Localization)
+            foreach(var abbreviation in localization.Abbreviations)
+            {
+                // Skip units with ambiguous abbreviations, since there is no exception to describe this is why TryParse failed.
+                if (IsAmbiguousAbbreviation(localization, abbreviation)) continue;
+
+                Writer.WL($@"
+            {{
+                Assert.True({_quantity.Name}.TryParse(""1 {abbreviation}"", CultureInfo.GetCultureInfo(""{localization.Culture}""), out var parsed));
+                AssertEx.EqualTolerance(1, parsed.{unit.PluralName}, {unit.PluralName}Tolerance);
+                Assert.Equal({GetUnitFullName(unit)}, parsed.Unit);
+            }}
+");
+            }
+            Writer.WL($@"
+        }}
+
+        [Fact]
+        public void ParseUnit()
+        {{");
+            foreach(var unit in _quantity.Units.Where(u => string.IsNullOrEmpty(u.ObsoleteText)))
+            foreach(var localization in unit.Localization)
+            foreach(var abbreviation in localization.Abbreviations)
+            {
+                Writer.WL($@"
+            try
+            {{
+                var parsedUnit = {_quantity.Name}.ParseUnit(""{abbreviation}"", CultureInfo.GetCultureInfo(""{localization.Culture}""));
+                Assert.Equal({GetUnitFullName(unit)}, parsedUnit);
+            }} catch (AmbiguousUnitParseException) {{ /* Some units have the same abbreviations */ }}
+");
+            }
+            Writer.WL($@"
+        }}
+
+        [Fact]
+        public void TryParseUnit()
+        {{");
+            foreach(var unit in _quantity.Units.Where(u => string.IsNullOrEmpty(u.ObsoleteText)))
+            foreach(var localization in unit.Localization)
+            foreach(var abbreviation in localization.Abbreviations)
+            {
+                // Skip units with ambiguous abbreviations, since there is no exception to describe this is why TryParse failed.
+                if (IsAmbiguousAbbreviation(localization, abbreviation)) continue;
+
+                Writer.WL($@"
+            {{
+                Assert.True({_quantity.Name}.TryParseUnit(""{abbreviation}"", CultureInfo.GetCultureInfo(""{localization.Culture}""), out var parsedUnit));
+                Assert.Equal({GetUnitFullName(unit)}, parsedUnit);
+            }}
+");
+            }
+            Writer.WL($@"
+        }}
+
         [Theory]
         [MemberData(nameof(UnitTypes))]
         public void ToUnit({_unitEnumName} unit)
@@ -766,5 +844,12 @@ public void NegationOperator_ReturnsQuantity_WithNegatedValue(double value)
 }}");
             return Writer.ToString();
         }
+
+        private bool IsAmbiguousAbbreviation(Localization localization, string abbreviation)
+        {
+            return _quantity.Units.Count(u =>
+                u.Localization.SingleOrDefault(l => l.Culture == localization.Culture) is { } otherUnitLocalization &&
+                otherUnitLocalization.Abbreviations.Contains(abbreviation, StringComparer.OrdinalIgnoreCase)) > 1;
+        }
     }
 }