Skip to content

Commit 12496df

Browse files
EllerbachEllerbach
authored
Moving all bindings using System.Drawing to nuget (#222)
1 parent e613d4c commit 12496df

24 files changed

+47
-1133
lines changed

‎devices/Apa102/Apa102.nfproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<HintPath>packages\nanoFramework.System.Device.Spi.1.0.2\lib\System.Device.Spi.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
38+
<Reference Include="System.Drawing">
39+
<HintPath>packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
3842
<Reference Include="UnitsNet.Length, Version=4.110.0.0, Culture=neutral, PublicKeyToken=null">
3943
<HintPath>packages\UnitsNet.nanoFramework.Length.4.110.0\lib\UnitsNet.Length.dll</HintPath>
4044
<Private>True</Private>
@@ -49,7 +53,6 @@
4953
<Compile Include="Properties\AssemblyInfo.cs" />
5054
<None Include="*.md" />
5155
</ItemGroup>
52-
<Import Project="..\..\src\System.Drawing\System.Drawing.projitems" Label="Shared" />
5356
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5457
<!-- INSERT IMPORTS HERE -->
5558
<ProjectExtensions>

‎devices/Apa102/Apa102.nuspec

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<dependency id="nanoFramework.System.Device.Gpio" version="1.0.2" />
2525
<dependency id="nanoFramework.Runtime.Events" version="1.9.2" />
2626
<dependency id="nanoFramework.System.Device.Spi" version="1.0.2" />
27+
<dependency id="nanoFramework.System.Drawing" version="1.0.268" />
2728
<dependency id="UnitsNet.nanoFramework.Length" version="4.110.0" />
2829
</dependencies>
2930
</metadata>

‎devices/Apa102/Apa102.sln

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30413.136
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.32014.148
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Apa102", "Apa102.nfproj", "{BAFCA06F-E7CA-4476-BA1C-829F09589F83}"
76
EndProject
87
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Apa102.Samples", "samples\Apa102.Samples.nfproj", "{D8D03F9E-81C2-4A67-9C95-95E5EBE097B2}"
98
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Projects", "Shared Projects", "{6D6D0363-6333-41E0-BF7A-9859769DC1C8}"
11-
EndProject
12-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Drawing", "..\..\src\System.Drawing\System.Drawing.shproj", "{E86896A2-B40C-4C03-B0E3-979DAF764CD6}"
13-
EndProject
149
Global
15-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
16-
..\..\src\System.Drawing\System.Drawing.projitems*{e86896a2-b40c-4c03-b0e3-979daf764cd6}*SharedItemsImports = 13
17-
EndGlobalSection
1810
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1911
Debug|Any CPU = Debug|Any CPU
2012
Release|Any CPU = Release|Any CPU
@@ -36,9 +28,6 @@ Global
3628
GlobalSection(SolutionProperties) = preSolution
3729
HideSolutionNode = FALSE
3830
EndGlobalSection
39-
GlobalSection(NestedProjects) = preSolution
40-
{E86896A2-B40C-4C03-B0E3-979DAF764CD6} = {6D6D0363-6333-41E0-BF7A-9859769DC1C8}
41-
EndGlobalSection
4231
GlobalSection(ExtensibilityGlobals) = postSolution
4332
SolutionGuid = {0EBD36CA-794A-4CC2-A933-0289CE646F36}
4433
EndGlobalSection

‎devices/Apa102/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<package id="nanoFramework.Runtime.Events" version="1.9.2" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
66
<package id="nanoFramework.System.Device.Spi" version="1.0.2" targetFramework="netnanoframework10" />
7+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
78
<package id="Nerdbank.GitVersioning" version="3.4.194" developmentDependency="true" targetFramework="netnanoframework10" />
89
<package id="UnitsNet.nanoFramework.Length" version="4.110.0" targetFramework="netnanoframework10" />
910
</packages>

‎devices/Apa102/samples/Apa102.Samples.nfproj

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<HintPath>..\packages\nanoFramework.System.Device.Spi.1.0.2\lib\System.Device.Spi.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50+
<Reference Include="System.Drawing">
51+
<HintPath>..\packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
52+
</Reference>
5053
</ItemGroup>
5154
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5255
<ProjectExtensions>

‎devices/Apa102/samples/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<package id="nanoFramework.Runtime.Events" version="1.9.2" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
66
<package id="nanoFramework.System.Device.Spi" version="1.0.2" targetFramework="netnanoframework10" />
7+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
78
</packages>

‎devices/Bh1745/Bh1745.nfproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<HintPath>packages\nanoFramework.System.Device.Model.1.0.259\lib\System.Device.Model.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46+
<Reference Include="System.Drawing">
47+
<HintPath>packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
48+
</Reference>
4649
<Reference Include="System.Math, Version=1.4.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4750
<HintPath>packages\nanoFramework.System.Math.1.4.3\lib\System.Math.dll</HintPath>
4851
<Private>True</Private>
@@ -63,7 +66,6 @@
6366
<None Include="*.md" />
6467
</ItemGroup>
6568
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
66-
<Import Project="..\..\src\System.Drawing\System.Drawing.projitems" Label="Shared" />
6769
<ProjectExtensions>
6870
<ProjectCapabilities>
6971
<ProjectConfigurationsDeclaredAsItems />

‎devices/Bh1745/Bh1745.nuspec

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<dependency id="nanoFramework.System.Device.I2c" version="1.0.2" />
2727
<dependency id="UnitsNet.nanoFramework.Length" version="4.110.0" />
2828
<dependency id="nanoFramework.System.Math" version="1.4.3" />
29+
<dependency id="nanoFramework.System.Drawing" version="1.0.268" />
2930
<dependency id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.0.259" />
3031
<dependency id="nanoFramework.System.Device.Model" version="1.0.259" />
3132
</dependencies>

‎devices/Bh1745/Bh1745.sln

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.30413.136
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.32014.148
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Bh1745", "Bh1745.nfproj", "{97D76471-5225-4F7F-AF68-05E05C5E195D}"
66
EndProject
77
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Bh1745.Sample", "samples\Bh1745.Sample\Bh1745.Sample.nfproj", "{68DC08DA-B7EF-4879-A86F-680A805DD5AA}"
88
EndProject
9-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Projects", "Shared Projects", "{6760BB95-C443-456B-AFDE-062C102D63FC}"
10-
EndProject
11-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Drawing", "..\..\src\System.Drawing\System.Drawing.shproj", "{E86896A2-B40C-4C03-B0E3-979DAF764CD6}"
12-
EndProject
139
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bh1745CustomConfiguration.Sample", "samples\Bh1745CustomConfiguration.Sample\Bh1745CustomConfiguration.Sample.nfproj", "{9E92F204-AFDD-4F26-AA87-35B9AEDB8F9E}"
1410
EndProject
1511
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{A97AE47B-79E8-4626-B1F6-25CA554FEA11}"
1612
EndProject
1713
Global
18-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
19-
..\..\src\System.Drawing\System.Drawing.projitems*{e86896a2-b40c-4c03-b0e3-979daf764cd6}*SharedItemsImports = 13
20-
EndGlobalSection
2114
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2215
Debug|Any CPU = Debug|Any CPU
2316
Release|Any CPU = Release|Any CPU
@@ -45,7 +38,6 @@ Global
4538
EndGlobalSection
4639
GlobalSection(NestedProjects) = preSolution
4740
{68DC08DA-B7EF-4879-A86F-680A805DD5AA} = {A97AE47B-79E8-4626-B1F6-25CA554FEA11}
48-
{E86896A2-B40C-4C03-B0E3-979DAF764CD6} = {6760BB95-C443-456B-AFDE-062C102D63FC}
4941
{9E92F204-AFDD-4F26-AA87-35B9AEDB8F9E} = {A97AE47B-79E8-4626-B1F6-25CA554FEA11}
5042
EndGlobalSection
5143
GlobalSection(ExtensibilityGlobals) = postSolution

‎devices/Bh1745/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
77
<package id="nanoFramework.System.Device.I2c" version="1.0.2" targetFramework="netnanoframework10" />
88
<package id="nanoFramework.System.Device.Model" version="1.0.259" targetFramework="netnanoframework10" />
9+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
910
<package id="nanoFramework.System.Math" version="1.4.3" targetFramework="netnanoframework10" />
1011
<package id="Nerdbank.GitVersioning" version="3.4.194" developmentDependency="true" targetFramework="netnanoframework10" />
1112
<package id="UnitsNet.nanoFramework.Length" version="4.110.0" targetFramework="netnanoframework10" />

‎devices/Bh1745/samples/Bh1745.Sample/Bh1745.Sample.nfproj

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<HintPath>..\..\packages\nanoFramework.System.Device.Model.1.0.259\lib\System.Device.Model.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46+
<Reference Include="System.Drawing">
47+
<HintPath>..\..\packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
48+
</Reference>
4649
</ItemGroup>
4750
<ItemGroup>
4851
<None Include="packages.config" />

‎devices/Bh1745/samples/Bh1745.Sample/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
77
<package id="nanoFramework.System.Device.I2c" version="1.0.2" targetFramework="netnanoframework10" />
88
<package id="nanoFramework.System.Device.Model" version="1.0.259" targetFramework="netnanoframework10" />
9+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
910
</packages>

‎devices/Bh1745/samples/Bh1745CustomConfiguration.Sample/Bh1745CustomConfiguration.Sample.nfproj

+7-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
<HintPath>..\..\packages\nanoFramework.Runtime.Events.1.9.2\lib\nanoFramework.Runtime.Events.dll</HintPath>
2828
<Private>True</Private>
2929
</Reference>
30-
<Reference Include="System.Buffers.Binary, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
30+
<Reference Include="System.Buffers.Binary">
3131
<HintPath>..\..\packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.0.259\lib\System.Buffers.Binary.dll</HintPath>
3232
<Private>True</Private>
33-
<SpecificVersion>True</SpecificVersion>
33+
</Reference>
34+
<Reference Include="System.Buffers.Binary.BinaryPrimitives">
35+
<HintPath>..\..\packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.0.259\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
3436
</Reference>
3537
<Reference Include="System.Device.Gpio, Version=1.0.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3638
<HintPath>..\..\packages\nanoFramework.System.Device.Gpio.1.0.2\lib\System.Device.Gpio.dll</HintPath>
@@ -45,6 +47,9 @@
4547
<Private>True</Private>
4648
<SpecificVersion>True</SpecificVersion>
4749
</Reference>
50+
<Reference Include="System.Drawing">
51+
<HintPath>..\..\packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
52+
</Reference>
4853
</ItemGroup>
4954
<ItemGroup>
5055
<None Include="packages.config" />

‎devices/Bh1745/samples/Bh1745CustomConfiguration.Sample/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
77
<package id="nanoFramework.System.Device.I2c" version="1.0.2" targetFramework="netnanoframework10" />
88
<package id="nanoFramework.System.Device.Model" version="1.0.259" targetFramework="netnanoframework10" />
9+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
910
</packages>

‎devices/Ws28xx/Ws28xx.nfproj

+8-4
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,21 @@
2323
<Reference Include="mscorlib, Version=1.11.7.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
2424
<HintPath>packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll</HintPath>
2525
<Private>True</Private>
26-
<SpecificVersion>True</SpecificVersion>
2726
</Reference>
2827
<Reference Include="nanoFramework.Runtime.Events">
2928
<HintPath>packages\nanoFramework.Runtime.Events.1.9.2\lib\nanoFramework.Runtime.Events.dll</HintPath>
29+
<Private>True</Private>
3030
</Reference>
31-
<Reference Include="System.Device.Gpio">
31+
<Reference Include="System.Device.Gpio, Version=1.0.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3232
<HintPath>packages\nanoFramework.System.Device.Gpio.1.0.2\lib\System.Device.Gpio.dll</HintPath>
33+
<Private>True</Private>
3334
</Reference>
34-
<Reference Include="System.Device.Spi">
35+
<Reference Include="System.Device.Spi, Version=1.0.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3536
<HintPath>packages\nanoFramework.System.Device.Spi.1.0.2\lib\System.Device.Spi.dll</HintPath>
37+
<Private>True</Private>
38+
</Reference>
39+
<Reference Include="System.Drawing">
40+
<HintPath>packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
3641
</Reference>
3742
</ItemGroup>
3843
<ItemGroup>
@@ -46,7 +51,6 @@
4651
<None Include="*.md" />
4752
</ItemGroup>
4853
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
49-
<Import Project="..\..\src\System.Drawing\System.Drawing.projitems" Label="Shared" />
5054
<ProjectExtensions>
5155
<ProjectCapabilities>
5256
<ProjectConfigurationsDeclaredAsItems />

‎devices/Ws28xx/Ws28xx.nuspec

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<dependency id="nanoFramework.Runtime.Events" version="1.9.2" />
2525
<dependency id="nanoFramework.System.Device.Spi" version="1.0.2" />
2626
<dependency id="nanoFramework.System.Device.Gpio" version="1.0.2" />
27+
<dependency id="nanoFramework.System.Drawing" version="1.0.268" />
2728
</dependencies>
2829
</metadata>
2930
<files>

‎devices/Ws28xx/Ws28xx.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.31613.86
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.32014.148
44
MinimumVisualStudioVersion = 15.0.26124.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B2C3D1C3-4F59-4544-982C-E205F522DF27}"
66
EndProject

‎devices/Ws28xx/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<package id="nanoFramework.Runtime.Events" version="1.9.2" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
66
<package id="nanoFramework.System.Device.Spi" version="1.0.2" targetFramework="netnanoframework10" />
7+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
78
<package id="Nerdbank.GitVersioning" version="3.4.240" developmentDependency="true" targetFramework="netnanoframework10" />
89
</packages>

‎devices/Ws28xx/samples/Ws28xx.Samples.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@
3636
<Reference Include="System.Device.Gpio, Version=1.0.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3737
<HintPath>..\packages\nanoFramework.System.Device.Gpio.1.0.2\lib\System.Device.Gpio.dll</HintPath>
3838
<Private>True</Private>
39-
<SpecificVersion>True</SpecificVersion>
4039
</Reference>
4140
<Reference Include="System.Device.Spi, Version=1.0.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4241
<HintPath>..\packages\nanoFramework.System.Device.Spi.1.0.2\lib\System.Device.Spi.dll</HintPath>
4342
<Private>True</Private>
44-
<SpecificVersion>True</SpecificVersion>
43+
</Reference>
44+
<Reference Include="System.Drawing">
45+
<HintPath>..\packages\nanoFramework.System.Drawing.1.0.268\lib\System.Drawing.dll</HintPath>
4546
</Reference>
4647
</ItemGroup>
4748
<ItemGroup>
@@ -57,7 +58,6 @@
5758
<ProjectReference Include="..\Ws28xx.nfproj" />
5859
</ItemGroup>
5960
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
60-
<Import Project="..\..\..\src\System.Runtime.CompilerService\System.Runtime.CompilerService.projitems" Label="Shared" />
6161
<ProjectExtensions>
6262
<ProjectCapabilities>
6363
<ProjectConfigurationsDeclaredAsItems />

‎devices/Ws28xx/samples/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<package id="nanoFramework.Runtime.Events" version="1.9.2" targetFramework="netnanoframework10" />
66
<package id="nanoFramework.System.Device.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
77
<package id="nanoFramework.System.Device.Spi" version="1.0.2" targetFramework="netnanoframework10" />
8+
<package id="nanoFramework.System.Drawing" version="1.0.268" targetFramework="netnanoframework10" />
89
<package id="Nerdbank.GitVersioning" version="3.4.240" targetFramework="netnanoframework10" developmentDependency="true" />
910
</packages>

0 commit comments

Comments
 (0)