Skip to content

Commit bdb54db

Browse files
IsakNaslundBhFraser Greenroyd
IsakNaslundBh
authored and
Fraser Greenroyd
committed
Update to .netstandard2.0
1 parent fd2acf9 commit bdb54db

File tree

5 files changed

+47
-395
lines changed

5 files changed

+47
-395
lines changed

‎Units_Engine/Properties/AssemblyInfo.cs‎

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

‎Units_Engine/Units_Engine.csproj‎

Lines changed: 30 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -1,225 +1,49 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{45191654-A1A1-4F08-9F69-0C976EB6AEDA}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyVersion>6.0.0.0</AssemblyVersion>
6+
<Description>https://github.com/BHoM/Localisation_Toolkit</Description>
7+
<Version>5.0.0</Version>
8+
<Authors>BHoM</Authors>
9+
<Copyright>Copyright © https://github.com/BHoM</Copyright>
1010
<RootNamespace>BH.Engine.Units</RootNamespace>
11-
<AssemblyName>Units_Engine</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
11+
<FileVersion>6.2.0.0</FileVersion>
12+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1513
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
2016
<OutputPath>..\Build\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>..\Build\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
3217
</PropertyGroup>
18+
19+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
20+
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y&#xD;&#xA;xcopy &quot;$(TargetDir)UnitsNet.dll&quot; &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y" />
21+
</Target>
22+
23+
<ItemGroup>
24+
<PackageReference Include="UnitsNet" Version="4.145.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectReference Include="..\Units_oM\Units_oM.csproj" />
29+
</ItemGroup>
30+
3331
<ItemGroup>
3432
<Reference Include="BHoM">
3533
<SpecificVersion>False</SpecificVersion>
36-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
34+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
3735
<Private>False</Private>
3836
</Reference>
3937
<Reference Include="BHoM_Engine">
4038
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
39+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
4240
<Private>False</Private>
4341
</Reference>
4442
<Reference Include="Quantities_oM">
4543
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>C:\ProgramData\BHoM\Assemblies\Quantities_oM.dll</HintPath>
44+
<HintPath>$(ProgramData)\BHoM\Assemblies\Quantities_oM.dll</HintPath>
4745
<Private>False</Private>
4846
</Reference>
49-
<Reference Include="System" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52-
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
53-
</Reference>
54-
<Reference Include="System.Xml.Linq" />
55-
<Reference Include="System.Data.DataSetExtensions" />
56-
<Reference Include="Microsoft.CSharp" />
57-
<Reference Include="System.Data" />
58-
<Reference Include="System.Net.Http" />
59-
<Reference Include="System.Xml" />
60-
<Reference Include="UnitsNet, Version=4.0.0.0, Culture=neutral, PublicKeyToken=f8601875a1f041da, processorArchitecture=MSIL">
61-
<HintPath>..\packages\UnitsNet.4.145.0\lib\net47\UnitsNet.dll</HintPath>
62-
</Reference>
6347
</ItemGroup>
64-
<ItemGroup>
65-
<Compile Include="Convert\Acceleration\Acceleration.cs" />
66-
<Compile Include="Convert\Acceleration\StandardGravity.cs" />
67-
<Compile Include="Convert\Acceleration\FootPerSecondSquared.cs" />
68-
<Compile Include="Convert\Acceleration\InchPerSecondSquared.cs" />
69-
<Compile Include="Convert\Angle\Arcminute.cs" />
70-
<Compile Include="Convert\Angle\Arcsecond.cs" />
71-
<Compile Include="Convert\Angle\Degree.cs" />
72-
<Compile Include="Convert\Angle\Angle.cs" />
73-
<Compile Include="Convert\AreaMomentOfInertia\FootToTheFourth.cs" />
74-
<Compile Include="Convert\AreaMomentOfInertia\AreaMomentOfInertia.cs" />
75-
<Compile Include="Convert\AreaMomentOfInertia\MillimetreToTheFourth.cs" />
76-
<Compile Include="Convert\AreaMomentOfInertia\InchToTheFourth.cs" />
77-
<Compile Include="Convert\AreaMomentOfInertia\CentimetreToTheFourth.cs" />
78-
<Compile Include="Convert\Area\Hectare.cs" />
79-
<Compile Include="Convert\Area\Area.cs" />
80-
<Compile Include="Convert\Area\SquareFoot.cs" />
81-
<Compile Include="Convert\Area\SquareInch.cs" />
82-
<Compile Include="Convert\Area\Acre.cs" />
83-
<Compile Include="Convert\Area\SquareNauticalMile.cs" />
84-
<Compile Include="Convert\Area\SquareYard.cs" />
85-
<Compile Include="Convert\Area\SquareMile.cs" />
86-
<Compile Include="Convert\Area\SquareMillimetre.cs" />
87-
<Compile Include="Convert\Area\SquareCentimetre.cs" />
88-
<Compile Include="Convert\Area\SquareKilometre.cs" />
89-
<Compile Include="Convert\CoefficientOfThermalExpansion\InverseDeltaDegreeCelsius.cs" />
90-
<Compile Include="Convert\CoefficientOfThermalExpansion\CoefficientOfThermalExpansion.cs" />
91-
<Compile Include="Convert\TemperatureDelta\DeltaDegreeFahrenheit.cs" />
92-
<Compile Include="Convert\TemperatureDelta\TemperatureDelta.cs" />
93-
<Compile Include="Convert\Density\KilogramPerLitre.cs" />
94-
<Compile Include="Convert\Density\GramPerMillilitre.cs" />
95-
<Compile Include="Convert\Density\GramPerLitre.cs" />
96-
<Compile Include="Convert\Density\Density.cs" />
97-
<Compile Include="Convert\Density\PoundPerCubicFoot.cs" />
98-
<Compile Include="Convert\Density\PoundPerUSGallon.cs" />
99-
<Compile Include="Convert\Density\PoundPerImperialGallon.cs" />
100-
<Compile Include="Convert\Density\KilogramPerCubicCentimetre.cs" />
101-
<Compile Include="Convert\Density\TonnePerCubicMetre.cs" />
102-
<Compile Include="Convert\Density\TonnePerCubicCentimetre.cs" />
103-
<Compile Include="Convert\Density\KilogramPerCubicMillimetre.cs" />
104-
<Compile Include="Convert\Density\TonnePerCubicMillimetre.cs" />
105-
<Compile Include="Convert\Density\PoundPerCubicInch.cs" />
106-
<Compile Include="Convert\Density\GramPerCubicMetre.cs" />
107-
<Compile Include="Convert\Density\GramPerCubicCentimetre.cs" />
108-
<Compile Include="Convert\Density\GramPerCubicMillimetre.cs" />
109-
<Compile Include="Convert\ForcePerLength\KilopoundForcePerInch.cs" />
110-
<Compile Include="Convert\ForcePerLength\ForcePerLength.cs" />
111-
<Compile Include="Convert\ForcePerLength\TonneForcePerMetre.cs" />
112-
<Compile Include="Convert\ForcePerLength\TonneForcePerMillimetre.cs" />
113-
<Compile Include="Convert\ForcePerLength\TonneForcePerCentimetre.cs" />
114-
<Compile Include="Convert\ForcePerLength\KilogramForcePerMillimetre.cs" />
115-
<Compile Include="Convert\ForcePerLength\KilogramForcePerCentimetre.cs" />
116-
<Compile Include="Convert\ForcePerLength\KilonewtonPerMetre.cs" />
117-
<Compile Include="Convert\ForcePerLength\KilonewtonPerCentimetre.cs" />
118-
<Compile Include="Convert\ForcePerLength\KilopoundForcePerFoot.cs" />
119-
<Compile Include="Convert\ForcePerLength\KilonewtonPerMillimetre.cs" />
120-
<Compile Include="Convert\ForcePerLength\NewtonPerCentimetre.cs" />
121-
<Compile Include="Convert\ForcePerLength\PoundForcePerYard.cs" />
122-
<Compile Include="Convert\ForcePerLength\PoundForcePerInch.cs" />
123-
<Compile Include="Convert\ForcePerLength\PoundForcePerFoot.cs" />
124-
<Compile Include="Convert\ForcePerLength\NewtonPerMillimetre.cs" />
125-
<Compile Include="Convert\ForcePerLength\KilogramForcePerMetre.cs" />
126-
<Compile Include="Convert\Force\KilogramForce.cs" />
127-
<Compile Include="Convert\Force\Force.cs" />
128-
<Compile Include="Convert\Force\Meganewton.cs" />
129-
<Compile Include="Convert\Force\OunceForce.cs" />
130-
<Compile Include="Convert\Force\KiloPoundForce.cs" />
131-
<Compile Include="Convert\Force\PoundForce.cs" />
132-
<Compile Include="Convert\Force\TonneForce.cs" />
133-
<Compile Include="Convert\Force\Kilonewton.cs" />
134-
<Compile Include="Convert\Length\Length.cs" />
135-
<Compile Include="Convert\Length\Angstrom.cs" />
136-
<Compile Include="Convert\Length\Centimetre.cs" />
137-
<Compile Include="Convert\Length\Foot.cs" />
138-
<Compile Include="Convert\Length\Inch.cs" />
139-
<Compile Include="Convert\Length\Kilometre.cs" />
140-
<Compile Include="Convert\Length\Micrometre.cs" />
141-
<Compile Include="Convert\Length\Mile.cs" />
142-
<Compile Include="Convert\Length\Millimetre.cs" />
143-
<Compile Include="Convert\Length\Nanometre.cs" />
144-
<Compile Include="Convert\Length\NauticalMile.cs" />
145-
<Compile Include="Convert\Length\Yard.cs" />
146-
<Compile Include="Convert\MomentPerLength\KilopoundForceFootPerFoot.cs" />
147-
<Compile Include="Convert\MomentPerLength\TonneForceMetrePerMetre.cs" />
148-
<Compile Include="Convert\MomentPerLength\KilonewtonMetrePerMetre.cs" />
149-
<Compile Include="Convert\MomentPerLength\KilogramForceMetrePerMetre.cs" />
150-
<Compile Include="Convert\MomentPerLength\PoundForceFootPerFoot.cs" />
151-
<Compile Include="Convert\MomentPerLength\NewtonCentimetrePerMetre.cs" />
152-
<Compile Include="Convert\MomentPerLength\NewtonMillimetrePerMetre.cs" />
153-
<Compile Include="Convert\MomentPerLength\MomentPerLength.cs" />
154-
<Compile Include="Convert\Pressure\Pressure.cs" />
155-
<Compile Include="Convert\Pressure\KilonewtonPerSquareMetre.cs" />
156-
<Compile Include="Convert\Pressure\KilonewtonPerSquareCentimetre.cs" />
157-
<Compile Include="Convert\Pressure\KilonewtonPerSquareMillimetre.cs" />
158-
<Compile Include="Convert\Pressure\KilopoundForcePerSquareFoot.cs" />
159-
<Compile Include="Convert\Pressure\KilopoundForcePerSquareInch.cs" />
160-
<Compile Include="Convert\Pressure\TechnicalAtmosphere.cs" />
161-
<Compile Include="Convert\Pressure\Bar.cs" />
162-
<Compile Include="Convert\Pressure\Atmosphere.cs" />
163-
<Compile Include="Convert\Pressure\PoundForcePerSquareFoot.cs" />
164-
<Compile Include="Convert\Pressure\PoundForcePerSquareInch.cs" />
165-
<Compile Include="Convert\Pressure\TonneForcePerSquareCentimetre.cs" />
166-
<Compile Include="Convert\Pressure\TonneForcePerSquareMillimetre.cs" />
167-
<Compile Include="Convert\Pressure\TonneForcePerSquareMetre.cs" />
168-
<Compile Include="Convert\Pressure\NewtonPerSquareMillimetre.cs" />
169-
<Compile Include="Convert\Pressure\NewtonPerSquareCentimetre.cs" />
170-
<Compile Include="Convert\Pressure\KilogramForcePerSquareMillimetre.cs" />
171-
<Compile Include="Convert\Pressure\KilogramForcePerSquareCentimetre.cs" />
172-
<Compile Include="Convert\Pressure\KilogramForcePerSquareMetre.cs" />
173-
<Compile Include="Convert\CoefficientOfThermalExpansion\InverseDeltaDegreeFahrenheit.cs" />
174-
<Compile Include="Convert\TemperatureDelta\DeltaDegreeCelsius.cs" />
175-
<Compile Include="Convert\Temperature\DegreeFahrenheit.cs" />
176-
<Compile Include="Convert\Temperature\DegreeCelsius.cs" />
177-
<Compile Include="Convert\Temperature\Temperature.cs" />
178-
<Compile Include="Convert\Torque\KilonewtonMetre.cs" />
179-
<Compile Include="Convert\Torque\KilonewtonMillimetre.cs" />
180-
<Compile Include="Convert\Torque\KilonewtonCentimetre.cs" />
181-
<Compile Include="Convert\Torque\KilopoundForceFoot.cs" />
182-
<Compile Include="Convert\Torque\KilopoundForceInch.cs" />
183-
<Compile Include="Convert\Torque\Torque.cs" />
184-
<Compile Include="Convert\Torque\TonneForceMetre.cs" />
185-
<Compile Include="Convert\Torque\TonneForceMillimetre.cs" />
186-
<Compile Include="Convert\Torque\TonneForceCentimetre.cs" />
187-
<Compile Include="Convert\Torque\KilogramForceMetre.cs" />
188-
<Compile Include="Convert\Torque\KilogramForceCentimetre.cs" />
189-
<Compile Include="Convert\Torque\KilogramForceMillimetre.cs" />
190-
<Compile Include="Convert\Torque\PoundForceFoot.cs" />
191-
<Compile Include="Convert\Torque\PoundForceInch.cs" />
192-
<Compile Include="Convert\Torque\NewtonCentimetre.cs" />
193-
<Compile Include="Convert\Torque\NewtonMillimetre.cs" />
194-
<Compile Include="Convert\Speed\Speed.cs" />
195-
<Compile Include="Convert\Speed\FootPerSecond.cs" />
196-
<Compile Include="Convert\Speed\InchPerSecond.cs" />
197-
<Compile Include="Convert\Volume\CubicFoot.cs" />
198-
<Compile Include="Convert\Volume\CubicInch.cs" />
199-
<Compile Include="Convert\Volume\CubicYard.cs" />
200-
<Compile Include="Convert\Volume\Volume.cs" />
201-
<Compile Include="Convert\Volume\USGallon.cs" />
202-
<Compile Include="Convert\Volume\ImperialGallon.cs" />
203-
<Compile Include="Convert\Volume\Litre.cs" />
204-
<Compile Include="Convert\Volume\CubicMillimetre.cs" />
205-
<Compile Include="Convert\Volume\CubicKilometre.cs" />
206-
<Compile Include="Convert\Volume\CubicCentimetre.cs" />
207-
<Compile Include="Properties\AssemblyInfo.cs" />
208-
</ItemGroup>
209-
<ItemGroup>
210-
<None Include="packages.config" />
211-
</ItemGroup>
212-
<ItemGroup>
213-
<ProjectReference Include="..\Units_oM\Units_oM.csproj">
214-
<Project>{3370e6de-2add-46df-9012-e4703970467c}</Project>
215-
<Name>Units_oM</Name>
216-
</ProjectReference>
217-
</ItemGroup>
218-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
219-
<PropertyGroup>
220-
<PostBuildEvent>
221-
xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y
222-
xcopy "$(TargetDir)UnitsNet.dll" "C:\ProgramData\BHoM\Assemblies" /Y
223-
xcopy "$(TargetDir)System.ValueTuple.dll" "C:\ProgramData\BHoM\Assemblies" /Y</PostBuildEvent>
224-
</PropertyGroup>
225-
</Project>
48+
49+
</Project>

‎Units_Engine/packages.config‎

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

0 commit comments

Comments
 (0)