Merge remote-tracking branch 'origin/master' into release/v6

Author: angularsen

.config/dotnet-tools.json

@@ -7,6 +7,12 @@
       "commands": [
         "dotnet-dotcover"
       ]
+    },
+    "timeitsharp": {
+      "version": "0.0.8",
+      "commands": [
+        "dotnet-timeit"
+      ]
     }
   }
 }

.gitignore

@@ -258,6 +258,4 @@ Artifacts
 
 # Build server tooling
 /secure-file
-/Tools/reportgenerator.exe
-/Tools/.store/
-/Tools/Temp
+/.tools/

Build/build-functions.psm1

@@ -1,13 +1,16 @@
-$root = "$PSScriptRoot\.."
+$root = (Resolve-Path "$PSScriptRoot\..").Path
 $artifactsDir = "$root\Artifacts"
-$nugetOutDir = "$root\Artifacts\NuGet"
-$testReportDir = "$root\Artifacts\Logs"
-$testCoverageDir = "$root\Artifacts\Coverage"
-$nuget = "$root\Tools\NuGet.exe"
+$nugetOutDir = "$artifactsDir\NuGet"
+$logsDir = "$artifactsDir\Logs"
+$testReportDir = "$artifactsDir\TestResults"
+$testCoverageDir = "$artifactsDir\Coverage"
+$toolsDir = "$root\.tools"
+
+$nuget = "$toolsDir\NuGet.exe"
 $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
 $msbuildPath = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
+
 if ($msbuildPath) {
-  $msbuild = join-path $msbuildPath 'MSBuild\Current\Bin\MSBuild.exe'
   $msbuildx64 = join-path $msbuildPath 'MSBuild\Current\Bin\amd64\MSBuild.exe'
 }
 
@@ -31,13 +34,9 @@ function Update-GeneratedCode {
 function Start-Build([boolean] $IncludeNanoFramework = $false) {
   write-host -foreground blue "Start-Build...`n---"
 
-  $fileLoggerArg = "/logger:FileLogger,Microsoft.Build;logfile=$testReportDir\UnitsNet.msbuild.log"
+  $fileLoggerArg = "/logger:FileLogger,Microsoft.Build;logfile=$logsDir\UnitsNet.msbuild.log"
 
-  $appVeyorLoggerDll = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  $appVeyorLoggerNetCoreDll = "C:\Program Files\AppVeyor\BuildAgent\dotnetcore\Appveyor.MSBuildLogger.dll"
-  $appVeyorLoggerArg = if (Test-Path "$appVeyorLoggerNetCoreDll") { "/logger:$appVeyorLoggerNetCoreDll" } else { "" }
-
-  dotnet build --configuration Release /p:ContinuousIntegrationBuild=true "$root\UnitsNet.sln" $fileLoggerArg $appVeyorLoggerArg
+  dotnet build --configuration Release /p:ContinuousIntegrationBuild=true "$root\UnitsNet.sln" $fileLoggerArg
   if ($lastexitcode -ne 0) { exit 1 }
 
   if (-not $IncludeNanoFramework)
@@ -47,13 +46,13 @@ function Start-Build([boolean] $IncludeNanoFramework = $false) {
   else
   {
     write-host -foreground green "Build .NET nanoFramework."
-    $fileLoggerArg = "/logger:FileLogger,Microsoft.Build;logfile=$testReportDir\UnitsNet.NanoFramework.msbuild.log"
-    $appVeyorLoggerArg = if (Test-Path "$appVeyorLoggerDll") { "/logger:$appVeyorLoggerDll" } else { "" }
+    $fileLoggerArg = "/logger:FileLogger,Microsoft.Build;logfile=$logsDir\UnitsNet.NanoFramework.msbuild.log"
 
     # msbuild does not auto-restore nugets for this project type
     & "$nuget" restore "$root\UnitsNet.NanoFramework\GeneratedCode\UnitsNet.nanoFramework.sln"
+
     # now build
-    & "$msbuildx64" "$root\UnitsNet.NanoFramework\GeneratedCode\UnitsNet.nanoFramework.sln" /verbosity:minimal /p:Configuration=Release /p:Platform="Any CPU" /p:ContinuousIntegrationBuild=true $fileLoggerArg $appVeyorLoggerArg
+    & "$msbuildx64" "$root\UnitsNet.NanoFramework\GeneratedCode\UnitsNet.nanoFramework.sln" /verbosity:minimal /p:Configuration=Release /p:Platform="Any CPU" /p:ContinuousIntegrationBuild=true $fileLoggerArg
     if ($lastexitcode -ne 0) { exit 1 }
   }
 
@@ -74,7 +73,6 @@ function Start-Tests {
   write-host -foreground blue "Run tests...`n---"
   foreach ($projectPath in $projectPaths) {
     $projectFileNameNoEx = [System.IO.Path]::GetFileNameWithoutExtension($projectPath)
-    $reportFile = "$testReportDir\${projectFileNameNoEx}.xunit.xml"
     $coverageReportFile = "$testCoverageDir\${projectFileNameNoEx}.coverage.xml"
     $projectDir = [System.IO.Path]::GetDirectoryName($projectPath)
 
@@ -84,6 +82,8 @@ function Start-Tests {
     # Create coverage report for this test project
     & dotnet dotcover test `
       --no-build `
+      --logger trx `
+      --results-directory "$testReportDir" `
       --dotCoverFilters="+:module=UnitsNet*;-:module=*Tests" `
       --dotCoverOutput="$coverageReportFile" `
       --dcReportType=DetailedXML
@@ -93,7 +93,7 @@ function Start-Tests {
   }
 
   # Generate a summarized code coverage report for all test projects
-  & "Tools/reportgenerator.exe" -reports:"$root/Artifacts/Coverage/*.coverage.xml" -targetdir:"$root/Artifacts/Coverage" -reporttypes:HtmlSummary
+  & "$toolsDir/reportgenerator.exe" -reports:"$testCoverageDir/*.coverage.xml" -targetdir:"$testCoverageDir" -reporttypes:HtmlSummary
 
   write-host -foreground blue "Run tests...END`n"
 }

Build/build-pack-nano-nugets.psm1

@@ -1,6 +1,7 @@
-$root = "$PSScriptRoot\.."
+$root = (Resolve-Path "$PSScriptRoot\..").Path
 $nugetOutDir = "$root\Artifacts\NuGet"
-$nuget = "$root\Tools\NuGet.exe"
+$toolsDir = "$root\.tools"
+$nuget = "$toolsDir\NuGet.exe"
 
 function Invoke-BuildNanoNugets {
 

Build/clean.ps1

@@ -1,7 +1,16 @@
 # Don't allow using undeclared variables
 Set-Strictmode -version latest
 
-$root = "$PSScriptRoot\.."
+$root = (Resolve-Path "$PSScriptRoot\..").Path
+$artifactsDir = "$root\Artifacts"
+$toolsDir = "$root\.tools"
+
+Write-Host -Foreground Blue "Delete .tools"
+Remove-Item -Recurse -Force -ErrorAction Ignore "$toolsDir"
+
+Write-Host -Foreground Blue "Delete Artifacts"
+Remove-Item -Recurse -Force -ErrorAction Ignore "$artifactsDir"
+
 Write-Host -Foreground Blue "Delete dirs: bin, obj"
 
 [int]$deleteCount = 0
@@ -20,8 +29,8 @@ if ($failedToDeleteDirs) {
   $failCount = $failedToDeleteDirs.Count
   Write-Host ""
   Write-Host -Foreground Red "Failed to delete $failCount dirs:"
-  $failedToDeleteDirs | %{ 
+  $failedToDeleteDirs | %{
     Write-Host -Foreground Red $_.FullName
   }
   exit /B 1
-}
+}

Build/init.ps1

@@ -1,17 +1,27 @@
 # Don't allow using undeclared variables
 Set-Strictmode -version latest
 
-$root = "$PSScriptRoot\.."
+$root = (Resolve-Path "$PSScriptRoot\..").Path
+$nugetPath = "$root/.tools/NuGet.exe"
+
 Write-Host -Foreground Blue "Initializing..."
 
 # Ensure temp dir exists
-$tempDir = "$root/Tools/Temp"
+$tempDir = "$root/.tools/temp_init"
 [system.io.Directory]::CreateDirectory($tempDir) | out-null
 
-if (-not (Test-Path "$root/Tools/reportgenerator.exe")) {
-  Write-Host -Foreground Blue "Download dotnet-reportgenerator-globaltool..."
-  dotnet tool install dotnet-reportgenerator-globaltool --tool-path Tools
-  Write-Host -Foreground Green "Download dotnet-reportgenerator-globaltool...OK."
+# Report generator for unit test coverage reports.
+if (-not (Test-Path "$root/.tools/reportgenerator.exe")) {
+  Write-Host -Foreground Blue "Install dotnet-reportgenerator-globaltool..."
+  dotnet tool install dotnet-reportgenerator-globaltool --tool-path .tools
+  Write-Host -Foreground Green "✅ Installed dotnet-reportgenerator-globaltool"
+}
+
+# NuGet.exe for non-SDK style projects, like UnitsNet.nanoFramework.
+if (-not (Test-Path "$nugetPath")) {
+  Write-Host -Foreground Blue "Downloading NuGet.exe..."
+  Invoke-WebRequest -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $nugetPath
+  Write-Host -Foreground Green "✅ Downloaded NuGet.exe: $nugetPath"
 }
 
 ###################################################

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.5.0</version>
+    <version>5.25.0</version>
     <title>Units.NET {_quantity.Name} - nanoFramework</title>
     <authors>Andreas Gullberg Larsen,nanoFramework project contributors</authors>
     <owners>UnitsNet</owners>

CodeGen/Generators/NanoFrameworkGenerator.cs

@@ -137,7 +137,7 @@ public static bool UpdateNanoFrameworkDependencies(
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = Path.Combine(rootDir, "Tools/nuget.exe"),
+                    FileName = Path.Combine(rootDir, ".tools/nuget.exe"),
                     Arguments = $"restore {path}\\UnitsNet.nanoFramework.sln",
                     UseShellExecute = false,
                     CreateNoWindow = true,
@@ -188,7 +188,7 @@ public static bool UpdateNanoFrameworkDependencies(
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = Path.Combine(rootDir, "Tools/nuget.exe"),
+                    FileName = Path.Combine(rootDir, ".tools/NuGet.exe"),
                     Arguments = $"update {path}\\UnitsNet.nanoFramework.sln -PreRelease",
                     UseShellExecute = false,
                     CreateNoWindow = true,

CodeGen/Generators/QuantityJsonFilesParser.cs

@@ -60,7 +60,7 @@ private static Quantity ParseQuantityFile(string jsonFileName)
 
         private static void OrderUnitsByName(Quantity quantity)
         {
-            quantity.Units = quantity.Units.OrderBy(u => u.SingularName).ToArray();
+            quantity.Units = quantity.Units.OrderBy(u => u.SingularName, StringComparer.OrdinalIgnoreCase).ToArray();
         }
 
         private static void FixConversionFunctionsForDecimalValueTypes(Quantity quantity)