Skip to content

Commit

Permalink
Merge generator scripts for WRC and NetFramework (#520)
Browse files Browse the repository at this point in the history
* Merge generator scripts for WRC and NetFramework

Handle WRC special cases in code generator scripts instead of in generated code.
This removes all the #if sections and merges the "Common" partial code back into
each of the WRC and NetFramework files so it is in one place and easy to read.

- Arrange huge quantity code into #regions, easier to navigate
- Move code generation into functions, easier to read
- Add Types.psm1 with types for intellisense on parsed JSON*
- Require PowerShell 5.1 (for classes)

* VS and VSCode struggle with intellisense when importing types with
'using module', this is relatively new and will probably improve later.

* Remove generated common code for quantities

* generate-code.bat: Set workdir to scripts folder

Needed for 'using module' in powershell to work, it can't have variables.

* Regen

* Fix WRC compile errors

Fix build warns about xmldoc

* Fix for code changes
  • Loading branch information
angularsen authored and tmilnthorp committed Oct 15, 2018
1 parent 86b2efc commit c5c6e51
Show file tree
Hide file tree
Showing 106 changed files with 5,674 additions and 64,573 deletions.
801 changes: 0 additions & 801 deletions Common/GeneratedCode/Quantities/Acceleration.Common.g.cs

This file was deleted.

823 changes: 0 additions & 823 deletions Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs

This file was deleted.

602 changes: 0 additions & 602 deletions Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs

This file was deleted.

822 changes: 0 additions & 822 deletions Common/GeneratedCode/Quantities/Angle.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/ApparentEnergy.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/ApparentPower.Common.g.cs

This file was deleted.

801 changes: 0 additions & 801 deletions Common/GeneratedCode/Quantities/Area.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/AreaDensity.Common.g.cs

This file was deleted.

647 changes: 0 additions & 647 deletions Common/GeneratedCode/Quantities/AreaMomentOfInertia.Common.g.cs

This file was deleted.

1,086 changes: 0 additions & 1,086 deletions Common/GeneratedCode/Quantities/BitRate.Common.g.cs

This file was deleted.

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/Capacitance.Common.g.cs

This file was deleted.

1,351 changes: 0 additions & 1,351 deletions Common/GeneratedCode/Quantities/Density.Common.g.cs

This file was deleted.

735 changes: 0 additions & 735 deletions Common/GeneratedCode/Quantities/Duration.Common.g.cs

This file was deleted.

647 changes: 0 additions & 647 deletions Common/GeneratedCode/Quantities/DynamicViscosity.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/ElectricAdmittance.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricCharge.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricChargeDensity.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/ElectricConductance.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricConductivity.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/ElectricCurrent.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricCurrentDensity.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricCurrentGradient.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricField.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/ElectricInductance.Common.g.cs

This file was deleted.

625 changes: 0 additions & 625 deletions Common/GeneratedCode/Quantities/ElectricPotential.Common.g.cs

This file was deleted.

624 changes: 0 additions & 624 deletions Common/GeneratedCode/Quantities/ElectricPotentialAc.Common.g.cs

This file was deleted.

624 changes: 0 additions & 624 deletions Common/GeneratedCode/Quantities/ElectricPotentialDc.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/ElectricResistance.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/ElectricResistivity.Common.g.cs

This file was deleted.

999 changes: 0 additions & 999 deletions Common/GeneratedCode/Quantities/Energy.Common.g.cs

This file was deleted.

669 changes: 0 additions & 669 deletions Common/GeneratedCode/Quantities/Entropy.Common.g.cs

This file was deleted.

735 changes: 0 additions & 735 deletions Common/GeneratedCode/Quantities/Force.Common.g.cs

This file was deleted.

757 changes: 0 additions & 757 deletions Common/GeneratedCode/Quantities/ForceChangeRate.Common.g.cs

This file was deleted.

713 changes: 0 additions & 713 deletions Common/GeneratedCode/Quantities/ForcePerLength.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/Frequency.Common.g.cs

This file was deleted.

867 changes: 0 additions & 867 deletions Common/GeneratedCode/Quantities/HeatFlux.Common.g.cs

This file was deleted.

559 changes: 0 additions & 559 deletions Common/GeneratedCode/Quantities/HeatTransferCoefficient.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/Illuminance.Common.g.cs

This file was deleted.

1,086 changes: 0 additions & 1,086 deletions Common/GeneratedCode/Quantities/Information.Common.g.cs

This file was deleted.

559 changes: 0 additions & 559 deletions Common/GeneratedCode/Quantities/Irradiance.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/Irradiation.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/KinematicViscosity.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/LapseRate.Common.g.cs

This file was deleted.

999 changes: 0 additions & 999 deletions Common/GeneratedCode/Quantities/Length.Common.g.cs

This file was deleted.

558 changes: 0 additions & 558 deletions Common/GeneratedCode/Quantities/Level.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/LinearDensity.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/LuminousFlux.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/LuminousIntensity.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/MagneticField.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/MagneticFlux.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/Magnetization.Common.g.cs

This file was deleted.

999 changes: 0 additions & 999 deletions Common/GeneratedCode/Quantities/Mass.Common.g.cs

This file was deleted.

845 changes: 0 additions & 845 deletions Common/GeneratedCode/Quantities/MassFlow.Common.g.cs

This file was deleted.

559 changes: 0 additions & 559 deletions Common/GeneratedCode/Quantities/MassFlux.Common.g.cs

This file was deleted.

1,131 changes: 0 additions & 1,131 deletions Common/GeneratedCode/Quantities/MassMomentOfInertia.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/MolarEnergy.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/MolarEntropy.Common.g.cs

This file was deleted.

779 changes: 0 additions & 779 deletions Common/GeneratedCode/Quantities/MolarMass.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/Molarity.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/Permeability.Common.g.cs

This file was deleted.

537 changes: 0 additions & 537 deletions Common/GeneratedCode/Quantities/Permittivity.Common.g.cs

This file was deleted.

955 changes: 0 additions & 955 deletions Common/GeneratedCode/Quantities/Power.Common.g.cs

This file was deleted.

1,483 changes: 0 additions & 1,483 deletions Common/GeneratedCode/Quantities/PowerDensity.Common.g.cs

This file was deleted.

558 changes: 0 additions & 558 deletions Common/GeneratedCode/Quantities/PowerRatio.Common.g.cs

This file was deleted.

1,329 changes: 0 additions & 1,329 deletions Common/GeneratedCode/Quantities/Pressure.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/PressureChangeRate.Common.g.cs

This file was deleted.

646 changes: 0 additions & 646 deletions Common/GeneratedCode/Quantities/Ratio.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/ReactiveEnergy.Common.g.cs

This file was deleted.

603 changes: 0 additions & 603 deletions Common/GeneratedCode/Quantities/ReactivePower.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/RotationalAcceleration.Common.g.cs

This file was deleted.

801 changes: 0 additions & 801 deletions Common/GeneratedCode/Quantities/RotationalSpeed.Common.g.cs

This file was deleted.

581 changes: 0 additions & 581 deletions Common/GeneratedCode/Quantities/RotationalStiffness.Common.g.cs

This file was deleted.

This file was deleted.

536 changes: 0 additions & 536 deletions Common/GeneratedCode/Quantities/SolidAngle.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/SpecificEnergy.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/SpecificEntropy.Common.g.cs

This file was deleted.

559 changes: 0 additions & 559 deletions Common/GeneratedCode/Quantities/SpecificVolume.Common.g.cs

This file was deleted.

889 changes: 0 additions & 889 deletions Common/GeneratedCode/Quantities/SpecificWeight.Common.g.cs

This file was deleted.

1,219 changes: 0 additions & 1,219 deletions Common/GeneratedCode/Quantities/Speed.Common.g.cs

This file was deleted.

691 changes: 0 additions & 691 deletions Common/GeneratedCode/Quantities/Temperature.Common.g.cs

This file was deleted.

735 changes: 0 additions & 735 deletions Common/GeneratedCode/Quantities/TemperatureChangeRate.Common.g.cs

This file was deleted.

690 changes: 0 additions & 690 deletions Common/GeneratedCode/Quantities/TemperatureDelta.Common.g.cs

This file was deleted.

559 changes: 0 additions & 559 deletions Common/GeneratedCode/Quantities/ThermalConductivity.Common.g.cs

This file was deleted.

625 changes: 0 additions & 625 deletions Common/GeneratedCode/Quantities/ThermalResistance.Common.g.cs

This file was deleted.

977 changes: 0 additions & 977 deletions Common/GeneratedCode/Quantities/Torque.Common.g.cs

This file was deleted.

536 changes: 0 additions & 536 deletions Common/GeneratedCode/Quantities/VitaminA.Common.g.cs

This file was deleted.

1,439 changes: 0 additions & 1,439 deletions Common/GeneratedCode/Quantities/Volume.Common.g.cs

This file was deleted.

1,087 changes: 0 additions & 1,087 deletions Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,95 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<Compile Include="GeneratedCode\**\*.cs" Exclude="**\AssemblyInfo.cs;**\obj\**" />
<Compile Include="GeneratedCode\Quantities\Acceleration.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\AmountOfSubstance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\AmplitudeRatio.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Angle.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ApparentEnergy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ApparentPower.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Area.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\AreaDensity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\AreaMomentOfInertia.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\BitRate.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\BrakeSpecificFuelConsumption.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Capacitance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Density.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Duration.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\DynamicViscosity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricAdmittance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricCharge.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricChargeDensity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricConductance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricConductivity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricCurrent.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricCurrentDensity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricCurrentGradient.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricField.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricInductance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricPotential.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricPotentialAc.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricPotentialDc.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricResistance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ElectricResistivity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Energy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Entropy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Force.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ForceChangeRate.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ForcePerLength.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Frequency.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\HeatFlux.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\HeatTransferCoefficient.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Illuminance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Information.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Irradiance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Irradiation.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\KinematicViscosity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\LapseRate.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Length.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Level.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\LinearDensity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\LuminousFlux.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\LuminousIntensity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MagneticField.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MagneticFlux.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Magnetization.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Mass.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MassFlow.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MassFlux.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MassMomentOfInertia.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MolarEnergy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MolarEntropy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Molarity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\MolarMass.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Permeability.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Permittivity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Power.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\PowerDensity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\PowerRatio.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Pressure.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\PressureChangeRate.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Ratio.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ReactiveEnergy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ReactivePower.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\RotationalAcceleration.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\RotationalSpeed.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\RotationalStiffness.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\RotationalStiffnessPerLength.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\SolidAngle.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\SpecificEnergy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\SpecificEntropy.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\SpecificVolume.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\SpecificWeight.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Speed.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Temperature.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\TemperatureChangeRate.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\TemperatureDelta.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ThermalConductivity.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\ThermalResistance.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Torque.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\VitaminA.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\Volume.WindowsRuntimeComponent.g.cs" />
<Compile Include="GeneratedCode\Quantities\VolumeFlow.WindowsRuntimeComponent.g.cs" />
<None Include="UnitsNet.WindowsRuntimeComponent.nuspec" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions UnitsNet/CustomCode/Quantities/Acceleration.extra.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
// THE SOFTWARE.

// ReSharper disable once CheckNamespace

using System;
using UnitsNet.Units;

namespace UnitsNet
{
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
Expand Down
Loading

0 comments on commit c5c6e51

Please sign in to comment.