Skip to content

Commit 784ef10

Browse files
committed
merged upstream & fixed issues with nullable ref types
- merged all upstream modifications - fixed nullability issues in UnitSystem - the Lazy<..> BaseUnits constructor was made protected - marked all tests that rely solely on BaseUnits as Obsolete (with error=false) - removed some obsolete tests from MassConcentration (tesing for default unit system units)
2 parents a8f022d + f0ba50c commit 784ef10

File tree

749 files changed

+86408
-8222
lines changed

Some content is hidden

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

749 files changed

+86408
-8222
lines changed

.github/workflows/automerge.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,4 +260,3 @@ Artifacts
260260
/secure-file
261261
/Tools/reportgenerator.exe
262262
/Tools/.store/
263-
codecov.sh

Build/build-functions.psm1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $nuget = "$root\Tools\NuGet.exe"
77
$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
88
$msbuild = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
99
if ($msbuild) {
10-
$msbuild = join-path $msbuild 'MSBuild\15.0\Bin\MSBuild.exe'
10+
$msbuild = join-path $msbuild 'MSBuild\Current\Bin\MSBuild.exe'
1111
}
1212

1313
function Remove-ArtifactsDir {
@@ -60,6 +60,7 @@ function Start-Build([boolean] $IncludeWindowsRuntimeComponent = $false) {
6060
function Start-Tests {
6161
$projectPaths = @(
6262
"UnitsNet.Tests\UnitsNet.Tests.csproj",
63+
"UnitsNet.NumberExtensions.Tests\UnitsNet.NumberExtensions.Tests.csproj",
6364
"UnitsNet.Serialization.JsonNet.Tests\UnitsNet.Serialization.JsonNet.Tests.csproj",
6465
"UnitsNet.Serialization.JsonNet.CompatibilityTests\UnitsNet.Serialization.JsonNet.CompatibilityTests.csproj"
6566
)
@@ -97,7 +98,8 @@ function Start-Tests {
9798
function Start-PackNugets {
9899
$projectPaths = @(
99100
"UnitsNet\UnitsNet.csproj",
100-
"UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.csproj"
101+
"UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.csproj",
102+
"UnitsNet.NumberExtensions\UnitsNet.NumberExtensions.csproj"
101103
)
102104

103105
write-host -foreground blue "Pack nugets...`n---"

Build/bump-version-UnitsNet-major.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
22
SET scriptdir=%~dp0
33
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump major
4+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump major
45
if %errorlevel% neq 0 exit /b %errorlevel%

Build/bump-version-UnitsNet-minor.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
22
SET scriptdir=%~dp0
33
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump minor
4+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump minor
45
if %errorlevel% neq 0 exit /b %errorlevel%

Build/bump-version-UnitsNet-patch.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
22
SET scriptdir=%~dp0
33
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump patch
4+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump patch
45
if %errorlevel% neq 0 exit /b %errorlevel%
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
22
SET scriptdir=%~dp0
33
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump suffix
4+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump suffix
45
if %errorlevel% neq 0 exit /b %errorlevel%
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
SET scriptdir=%~dp0
3+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump major
4+
if %errorlevel% neq 0 exit /b %errorlevel%
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
SET scriptdir=%~dp0
3+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump minor
4+
if %errorlevel% neq 0 exit /b %errorlevel%
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
SET scriptdir=%~dp0
3+
call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump patch
4+
if %errorlevel% neq 0 exit /b %errorlevel%

0 commit comments

Comments
 (0)