Skip to content

Commit 425b4d7

Browse files
rschieferrschiefer
authored
Updated unitsNet version and references (#30)
1 parent 209f1bf commit 425b4d7

File tree

490 files changed

+3462
-436
lines changed

Some content is hidden

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

490 files changed

+3462
-436
lines changed

‎src/devices_generated/AD5328/AD5328.nfproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
11+
<<<<<<< HEAD
12+
<ProjectGuid>{A4169A41-716A-4BDF-88B9-BF865CD48DB2}</ProjectGuid>
13+
=======
1114
<ProjectGuid>{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}</ProjectGuid>
15+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
1216
<OutputType>Library</OutputType>
1317
<AppDesignerFolder>Properties</AppDesignerFolder>
1418
<FileAlignment>512</FileAlignment>
@@ -33,7 +37,7 @@
3337
<Private>True</Private>
3438
</Reference>
3539
<Reference Include="UnitsNet.ElectricPotential">
36-
<HintPath>packages\UnitsNet.nanoFramework.ElectricPotential.4.91.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
40+
<HintPath>packages\UnitsNet.nanoFramework.ElectricPotential.4.92.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
3741
<Private>True</Private>
3842
</Reference>
3943
<Reference Include="System.Math">

‎src/devices_generated/AD5328/AD5328.sln

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.30413.136
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
<<<<<<< HEAD
7+
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328", "AD5328.nfproj", "{A4169A41-716A-4BDF-88B9-BF865CD48DB2}"
8+
EndProject
9+
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328.Samples", "samples\AD5328.Samples.nfproj", "{6DF271D6-BF4B-4157-A6AC-32B810BC3975}"
10+
=======
611
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328", "AD5328.nfproj", "{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}"
712
EndProject
813
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328.Samples", "samples\\AD5328.Samples.nfproj", "{264ADA55-EBE3-48CB-A3D6-C9F00183CE8C}"
14+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
915
EndProject
10-
<!-- SAMPLES PROJECT PLACEHOLDER -->
1116
<!-- UNIT TESTS PROJECT PLACEHOLDER -->
1217

1318
Global
@@ -16,11 +21,20 @@ Global
1621
Release|Any CPU = Release|Any CPU
1722
EndGlobalSection
1823
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
<<<<<<< HEAD
25+
{A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
28+
{A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Release|Any CPU.Deploy.0 = Release|Any CPU
31+
=======
1932
{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2033
{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Debug|Any CPU.Build.0 = Debug|Any CPU
2134
{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
2235
{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Release|Any CPU.ActiveCfg = Release|Any CPU
2336
{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Release|Any CPU.Build.0 = Release|Any CPU
2437
{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Release|Any CPU.Deploy.0 = Release|Any CPU
38+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
2539
EndGlobalSection
2640
EndGlobal

‎src/devices_generated/AD5328/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="nanoFramework.CoreLibrary" version="1.10.4-preview.11" targetFramework="netnanoframework10" />
44
<package id="nanoFramework.System.Device.Gpio" version="1.0.0-preview.40" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.Spi" version="1.0.0-preview.38" targetFramework="netnanoframework10" />
6-
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.91.0" targetFramework="netnanoframework10" />
6+
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.92.0" targetFramework="netnanoframework10" />
77
<package id="nanoFramework.System.Math" version="1.4.0-preview.7" targetFramework="netnanoframework10" />
88
<package id="Nerdbank.GitVersioning" version="3.4.194" developmentDependency="true" targetFramework="netnanoframework10" />
99
</packages>

‎src/devices_generated/AD5328/samples/AD5328.Samples.nfproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
11+
<<<<<<< HEAD
12+
<ProjectGuid>{6DF271D6-BF4B-4157-A6AC-32B810BC3975}</ProjectGuid>
13+
=======
1114
<ProjectGuid>{264ADA55-EBE3-48CB-A3D6-C9F00183CE8C}</ProjectGuid>
15+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
1216
<OutputType>Exe</OutputType>
1317
<AppDesignerFolder>Properties</AppDesignerFolder>
1418
<FileAlignment>512</FileAlignment>
@@ -33,7 +37,7 @@
3337
<Private>True</Private>
3438
</Reference>
3539
<Reference Include="UnitsNet.ElectricPotential">
36-
<HintPath>..\packages\UnitsNet.nanoFramework.ElectricPotential.4.91.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
40+
<HintPath>..\packages\UnitsNet.nanoFramework.ElectricPotential.4.92.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
3741
<Private>True</Private>
3842
</Reference>
3943
</ItemGroup>

‎src/devices_generated/AD5328/samples/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="nanoFramework.CoreLibrary" version="1.10.4-preview.11" targetFramework="netnanoframework10" />
44
<package id="nanoFramework.System.Device.Gpio" version="1.0.0-preview.40" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.Spi" version="1.0.0-preview.38" targetFramework="netnanoframework10" />
6-
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.91.0" targetFramework="netnanoframework10" />
6+
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.92.0" targetFramework="netnanoframework10" />
77
</packages>

‎src/devices_generated/Ads1115/Ads1115.nfproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
11+
<<<<<<< HEAD
12+
<ProjectGuid>{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}</ProjectGuid>
13+
=======
1114
<ProjectGuid>{07AC0697-656E-44CB-AF14-3A1942C782FD}</ProjectGuid>
15+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
1216
<OutputType>Library</OutputType>
1317
<AppDesignerFolder>Properties</AppDesignerFolder>
1418
<FileAlignment>512</FileAlignment>
@@ -33,11 +37,15 @@
3337
<Private>True</Private>
3438
</Reference>
3539
<Reference Include="UnitsNet.ElectricPotential">
36-
<HintPath>packages\UnitsNet.nanoFramework.ElectricPotential.4.91.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
40+
<HintPath>packages\UnitsNet.nanoFramework.ElectricPotential.4.92.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
3741
<Private>True</Private>
3842
</Reference>
3943
<Reference Include="UnitsNet.Length">
40-
<HintPath>packages\UnitsNet.nanoFramework.Length.4.91.0\lib\UnitsNet.Length.dll</HintPath>
44+
<HintPath>packages\UnitsNet.nanoFramework.Length.4.92.0\lib\UnitsNet.Length.dll</HintPath>
45+
<Private>True</Private>
46+
</Reference>
47+
<Reference Include="UnitsNet.Frequency">
48+
<HintPath>packages\UnitsNet.nanoFramework.Frequency.4.92.0\lib\UnitsNet.Frequency.dll</HintPath>
4149
<Private>True</Private>
4250
</Reference>
4351
<Reference Include="System.Math">

‎src/devices_generated/Ads1115/Ads1115.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.30413.136
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
<<<<<<< HEAD
7+
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115", "Ads1115.nfproj", "{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}"
8+
EndProject
9+
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115.Samples", "samples\\Ads1115.Samples.nfproj", "{CA079A53-86EE-470B-AAEB-2F07B12EF823}"
10+
=======
611
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115", "Ads1115.nfproj", "{07AC0697-656E-44CB-AF14-3A1942C782FD}"
712
EndProject
813
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115.Samples", "samples\\Ads1115.Samples.nfproj", "{DB46D7A9-617C-4C54-801A-08450BC6D855}"
14+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
915
EndProject
1016
<!-- SAMPLES PROJECT PLACEHOLDER -->
1117
<!-- UNIT TESTS PROJECT PLACEHOLDER -->
@@ -16,11 +22,20 @@ Global
1622
Release|Any CPU = Release|Any CPU
1723
EndGlobalSection
1824
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25+
<<<<<<< HEAD
26+
{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
29+
{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Release|Any CPU.Deploy.0 = Release|Any CPU
32+
=======
1933
{07AC0697-656E-44CB-AF14-3A1942C782FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2034
{07AC0697-656E-44CB-AF14-3A1942C782FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
2135
{07AC0697-656E-44CB-AF14-3A1942C782FD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
2236
{07AC0697-656E-44CB-AF14-3A1942C782FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
2337
{07AC0697-656E-44CB-AF14-3A1942C782FD}.Release|Any CPU.Build.0 = Release|Any CPU
2438
{07AC0697-656E-44CB-AF14-3A1942C782FD}.Release|Any CPU.Deploy.0 = Release|Any CPU
39+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
2540
EndGlobalSection
2641
EndGlobal

‎src/devices_generated/Ads1115/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
<package id="nanoFramework.CoreLibrary" version="1.10.4-preview.11" targetFramework="netnanoframework10" />
44
<package id="nanoFramework.System.Device.Gpio" version="1.0.0-preview.40" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.I2c" version="1.0.1-preview.33" targetFramework="netnanoframework10" />
6-
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.91.0" targetFramework="netnanoframework10" />
7-
<package id="UnitsNet.nanoFramework.Length" version="4.91.0" targetFramework="netnanoframework10" />
6+
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.92.0" targetFramework="netnanoframework10" />
7+
<package id="UnitsNet.nanoFramework.Length" version="4.92.0" targetFramework="netnanoframework10" />
8+
<package id="UnitsNet.nanoFramework.Frequency" version="4.92.0" targetFramework="netnanoframework10" />
89
<package id="nanoFramework.System.Math" version="1.4.0-preview.7" targetFramework="netnanoframework10" />
910
<package id="Nerdbank.GitVersioning" version="3.4.194" developmentDependency="true" targetFramework="netnanoframework10" />
1011
</packages>

‎src/devices_generated/Ads1115/samples/Ads1115.Samples.nfproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
11+
<<<<<<< HEAD
12+
<ProjectGuid>{CA079A53-86EE-470B-AAEB-2F07B12EF823}</ProjectGuid>
13+
=======
1114
<ProjectGuid>{DB46D7A9-617C-4C54-801A-08450BC6D855}</ProjectGuid>
15+
>>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
1216
<OutputType>Exe</OutputType>
1317
<AppDesignerFolder>Properties</AppDesignerFolder>
1418
<FileAlignment>512</FileAlignment>
@@ -33,7 +37,11 @@
3337
<Private>True</Private>
3438
</Reference>
3539
<Reference Include="UnitsNet.ElectricPotential">
36-
<HintPath>..\packages\UnitsNet.nanoFramework.ElectricPotential.4.91.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
40+
<HintPath>..\packages\UnitsNet.nanoFramework.ElectricPotential.4.92.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
41+
<Private>True</Private>
42+
</Reference>
43+
<Reference Include="UnitsNet.Frequency">
44+
<HintPath>..\packages\UnitsNet.nanoFramework.Frequency.4.92.0\lib\UnitsNet.Frequency.dll</HintPath>
3745
<Private>True</Private>
3846
</Reference>
3947
</ItemGroup>

‎src/devices_generated/Ads1115/samples/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<package id="nanoFramework.CoreLibrary" version="1.10.4-preview.11" targetFramework="netnanoframework10" />
44
<package id="nanoFramework.System.Device.Gpio" version="1.0.0-preview.40" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.I2c" version="1.0.1-preview.33" targetFramework="netnanoframework10" />
6-
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.91.0" targetFramework="netnanoframework10" />
6+
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.92.0" targetFramework="netnanoframework10" />
7+
<package id="UnitsNet.nanoFramework.Frequency" version="4.92.0" targetFramework="netnanoframework10" />
78
</packages>

0 commit comments

Comments
 (0)