diff --git a/Build/build-functions.psm1 b/Build/build-functions.psm1 index 788d340807..74adfd4c32 100644 --- a/Build/build-functions.psm1 +++ b/Build/build-functions.psm1 @@ -137,7 +137,7 @@ function Start-PackNugets { write-host -foreground yellow "Skipping nanoFramework nuget pack." } else { write-host -foreground yellow "nanoFramework project not yet supported by dotnet CLI, using nuget.exe instead" - Build-NanoNugets + Invoke-Build-NanoNugets } diff --git a/Build/build-pack-nano-nugets.psm1 b/Build/build-pack-nano-nugets.psm1 index 586addb2e6..1bf688249d 100644 --- a/Build/build-pack-nano-nugets.psm1 +++ b/Build/build-pack-nano-nugets.psm1 @@ -2,10 +2,10 @@ $nugetOutDir = "$root\Artifacts\NuGet" $nuget = "$root\Tools\NuGet.exe" -function Build-NanoNugets { +function Invoke-Build-NanoNugets { & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Temperature\UnitsNet.NanoFramework.Temperature.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir" } -export-modulemember -function Build-NanoNugets +export-modulemember -function Invoke-Build-NanoNugets diff --git a/Build/set-version-UnitsNet.ps1 b/Build/set-version-UnitsNet.ps1 index 1134e055a3..bac3cc006b 100644 --- a/Build/set-version-UnitsNet.ps1 +++ b/Build/set-version-UnitsNet.ps1 @@ -69,6 +69,12 @@ Set-AssemblyInfoVersion $winrtAssemblyInfoFile $newVersion # # Update .nuspec files Set-NuspecVersion $winrtNuspecFile $newVersion +# # Update .nuspec files for nanoFramework +Get-ChildItem -Path "$root\UnitsNet.NanoFramework\GeneratedCode" -Include '*.nuspec' -Recurse | + Foreach-object { + Set-NuspecVersion $_.FullName $newVersion + } + # Git commit and tag Invoke-CommitVersionBump @("UnitsNet") $versionFiles $newVersion Invoke-TagVersionBump "UnitsNet" $newVersion diff --git a/CodeGen/Generators/NanoFrameworkGenerator.cs b/CodeGen/Generators/NanoFrameworkGenerator.cs index c44c92ad2a..4469eb16c9 100644 --- a/CodeGen/Generators/NanoFrameworkGenerator.cs +++ b/CodeGen/Generators/NanoFrameworkGenerator.cs @@ -120,22 +120,19 @@ public static void Generate(string rootDir, Quantity[] quantities) Log.Information($"Creating .NET nanoFramework project for {quantity.Name}"); var projectPath = Path.Combine(outputDir, quantity.Name); + var sb = new StringBuilder($"{quantity.Name}:".PadRight(AlignPad)); GeneratePackage(projectPath, quantity.Name); - - Log.Information($"Package(OK)"); - - var sb = new StringBuilder($"{quantity.Name}:".PadRight(AlignPad)); GenerateUnitType(sb, quantity, Path.Combine(outputUnits, $"{quantity.Name}Unit.g.cs")); GenerateQuantity(sb, quantity, Path.Combine(outputQuantitites, $"{quantity.Name}.g.cs")); GenerateProject(sb, quantity, projectPath); - Log.Information(sb.ToString()); + numberQuantity++; } GenerateSolution(quantities, outputDir); Log.Information("UnitsNet.nanoFrmawork.sln generated"); - Log.Information($"Total quantities generated: {numberQuantity}"); + Log.Information($"Count of generated projects: {numberQuantity}"); } private static void GeneratePackage(string projectPath, string quantityName) diff --git a/Directory.Build.props b/Directory.Build.props index 6a98630c65..3d30cfaa34 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,6 +3,9 @@ $(MSBuildThisFileDirectory)Artifacts/$(MSBuildProjectName) + + $(MSBuildThisFileDirectory)Artifacts/UnitsNet.NanoFramework/$(MSBuildProjectName) + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Duration/UnitsNet.NanoFramework.Duration.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Duration/UnitsNet.NanoFramework.Duration.nuspec index c99cffb00e..8bd788d043 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Duration/UnitsNet.NanoFramework.Duration.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Duration/UnitsNet.NanoFramework.Duration.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Duration - 4.89.0 + 4.90.0 Units.NET Duration - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds Duration units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds Duration units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/ElectricCurrent/UnitsNet.NanoFramework.ElectricCurrent.nuspec b/UnitsNet.NanoFramework/GeneratedCode/ElectricCurrent/UnitsNet.NanoFramework.ElectricCurrent.nuspec index 44eeaaecb5..01bb62629c 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/ElectricCurrent/UnitsNet.NanoFramework.ElectricCurrent.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/ElectricCurrent/UnitsNet.NanoFramework.ElectricCurrent.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.ElectricCurrent - 4.89.0 + 4.90.0 Units.NET ElectricCurrent - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds ElectricCurrent units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds ElectricCurrent units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/ElectricPotential/UnitsNet.NanoFramework.ElectricPotential.nuspec b/UnitsNet.NanoFramework/GeneratedCode/ElectricPotential/UnitsNet.NanoFramework.ElectricPotential.nuspec index 20d112f579..f9e813b4a6 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/ElectricPotential/UnitsNet.NanoFramework.ElectricPotential.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/ElectricPotential/UnitsNet.NanoFramework.ElectricPotential.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.ElectricPotential - 4.89.0 + 4.90.0 Units.NET ElectricPotential - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds ElectricPotential units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds ElectricPotential units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/ElectricPotentialDc/UnitsNet.NanoFramework.ElectricPotentialDc.nuspec b/UnitsNet.NanoFramework/GeneratedCode/ElectricPotentialDc/UnitsNet.NanoFramework.ElectricPotentialDc.nuspec index 7d6b4b81f2..2858b004e3 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/ElectricPotentialDc/UnitsNet.NanoFramework.ElectricPotentialDc.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/ElectricPotentialDc/UnitsNet.NanoFramework.ElectricPotentialDc.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.ElectricPotentialDc - 4.89.0 + 4.90.0 Units.NET ElectricPotentialDc - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds ElectricPotentialDc units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds ElectricPotentialDc units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/ElectricResistance/UnitsNet.NanoFramework.ElectricResistance.nuspec b/UnitsNet.NanoFramework/GeneratedCode/ElectricResistance/UnitsNet.NanoFramework.ElectricResistance.nuspec index 7bc6dc6fda..99fef33455 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/ElectricResistance/UnitsNet.NanoFramework.ElectricResistance.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/ElectricResistance/UnitsNet.NanoFramework.ElectricResistance.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.ElectricResistance - 4.89.0 + 4.90.0 Units.NET ElectricResistance - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds ElectricResistance units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds ElectricResistance units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Frequency/UnitsNet.NanoFramework.Frequency.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Frequency/UnitsNet.NanoFramework.Frequency.nuspec index d5d2af712f..c8edbc58c4 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Frequency/UnitsNet.NanoFramework.Frequency.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Frequency/UnitsNet.NanoFramework.Frequency.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Frequency - 4.89.0 + 4.90.0 Units.NET Frequency - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds Frequency units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds Frequency units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Illuminance/UnitsNet.NanoFramework.Illuminance.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Illuminance/UnitsNet.NanoFramework.Illuminance.nuspec index 81d3a825a9..52061a8dca 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Illuminance/UnitsNet.NanoFramework.Illuminance.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Illuminance/UnitsNet.NanoFramework.Illuminance.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Illuminance - 4.89.0 + 4.90.0 Units.NET Illuminance - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds Illuminance units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds Illuminance units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Length/UnitsNet.NanoFramework.Length.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Length/UnitsNet.NanoFramework.Length.nuspec index 1fd2f918c4..d93629a322 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Length/UnitsNet.NanoFramework.Length.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Length/UnitsNet.NanoFramework.Length.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Length - 4.89.0 + 4.90.0 Units.NET Length - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds Length units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds Length units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Pressure/UnitsNet.NanoFramework.Pressure.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Pressure/UnitsNet.NanoFramework.Pressure.nuspec index 8ac858594c..5b63630124 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Pressure/UnitsNet.NanoFramework.Pressure.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Pressure/UnitsNet.NanoFramework.Pressure.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Pressure - 4.89.0 + 4.90.0 Units.NET Pressure - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds Pressure units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds Pressure units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Ratio/UnitsNet.NanoFramework.Ratio.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Ratio/UnitsNet.NanoFramework.Ratio.nuspec index eb323d1a0a..8ba5623824 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Ratio/UnitsNet.NanoFramework.Ratio.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Ratio/UnitsNet.NanoFramework.Ratio.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Ratio - 4.89.0 + 4.90.0 Units.NET Ratio - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds Ratio units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds Ratio units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/RelativeHumidity/UnitsNet.NanoFramework.RelativeHumidity.nuspec b/UnitsNet.NanoFramework/GeneratedCode/RelativeHumidity/UnitsNet.NanoFramework.RelativeHumidity.nuspec index c7f79652f9..b8177552f9 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/RelativeHumidity/UnitsNet.NanoFramework.RelativeHumidity.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/RelativeHumidity/UnitsNet.NanoFramework.RelativeHumidity.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.RelativeHumidity - 4.89.0 + 4.90.0 Units.NET RelativeHumidity - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds RelativeHumidity units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds RelativeHumidity units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/Temperature/UnitsNet.NanoFramework.Temperature.nuspec b/UnitsNet.NanoFramework/GeneratedCode/Temperature/UnitsNet.NanoFramework.Temperature.nuspec index e695f9fc52..a86b8d4f57 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Temperature/UnitsNet.NanoFramework.Temperature.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/Temperature/UnitsNet.NanoFramework.Temperature.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.Temperature - 4.89.0 + 4.90.0 Units.NET Temperature - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds temperature units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds temperature units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - + diff --git a/UnitsNet.NanoFramework/GeneratedCode/VolumeConcentration/UnitsNet.NanoFramework.VolumeConcentration.nuspec b/UnitsNet.NanoFramework/GeneratedCode/VolumeConcentration/UnitsNet.NanoFramework.VolumeConcentration.nuspec index 9583694dee..c6b05ea7e3 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/VolumeConcentration/UnitsNet.NanoFramework.VolumeConcentration.nuspec +++ b/UnitsNet.NanoFramework/GeneratedCode/VolumeConcentration/UnitsNet.NanoFramework.VolumeConcentration.nuspec @@ -2,14 +2,14 @@ UnitsNet.nanoFramework.VolumeConcentration - 4.89.0 + 4.90.0 Units.NET VolumeConcentration - nanoFramework - Andreas Gullberg Larsen, nanoFramework project contributors + Andreas Gullberg Larsen,nanoFramework project contributors UnitsNet MIT https://github.com/angularsen/UnitsNet false - Adds VolumeConcentration units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. + Adds VolumeConcentration units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead. https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png @@ -21,6 +21,6 @@ - +