Skip to content

Commit 7c08781

Browse files
networkfusionnetworkfusion
committed
Fix Yx5300 nugets
System.IO.Streams was defined multiple times. Also updates the nugets.
1 parent 762b078 commit 7c08781

File tree

7 files changed

+25
-29
lines changed

7 files changed

+25
-29
lines changed

‎devices/Yx5300/Yx5300.nfproj

+4-6
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,11 @@
5757
<HintPath>packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="System.IO.Ports, Version=1.1.78.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
61-
<HintPath>packages\nanoFramework.System.IO.Ports.1.1.78\lib\System.IO.Ports.dll</HintPath>
62-
<Private>True</Private>
60+
<Reference Include="System.IO.Ports">
61+
<HintPath>packages\nanoFramework.System.IO.Ports.1.1.84\lib\System.IO.Ports.dll</HintPath>
6362
</Reference>
64-
<Reference Include="System.IO.Streams, Version=1.1.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
65-
<HintPath>packages\nanoFramework.System.IO.Streams.1.1.52\lib\System.IO.Streams.dll</HintPath>
66-
<Private>True</Private>
63+
<Reference Include="System.IO.Streams">
64+
<HintPath>packages\nanoFramework.System.IO.Streams.1.1.59\lib\System.IO.Streams.dll</HintPath>
6765
</Reference>
6866
</ItemGroup>
6967
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />

‎devices/Yx5300/Yx5300.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency id="nanoFramework.System.Collections" version="1.5.31" />
2424
<dependency id="nanoFramework.System.IO.Ports" version="1.1.78" />
2525
<dependency id="nanoFramework.System.Text" version="1.2.54" />
26-
<dependency id="nanoFramework.System.IO.Streams" version="1.1.52" />
26+
<dependency id="nanoFramework.System.IO.Streams" version="1.1.59" />
2727
</dependencies>
2828
</metadata>
2929
<files>

‎devices/Yx5300/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
44
<package id="nanoFramework.Runtime.Events" version="1.11.15" targetFramework="netnano1.0" />
55
<package id="nanoFramework.System.Collections" version="1.5.31" targetFramework="netnano1.0" />
6-
<package id="nanoFramework.System.IO.Ports" version="1.1.78" targetFramework="netnano1.0" />
7-
<package id="nanoFramework.System.IO.Streams" version="1.1.52" targetFramework="netnano1.0" />
6+
<package id="nanoFramework.System.IO.Ports" version="1.1.84" targetFramework="netnano1.0" />
7+
<package id="nanoFramework.System.IO.Streams" version="1.1.59" targetFramework="netnano1.0" />
88
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
99
<package id="Nerdbank.GitVersioning" version="3.6.133" developmentDependency="true" targetFramework="netnano1.0" />
1010
<package id="StyleCop.MSBuild" version="6.2.0" targetFramework="netnano1.0" developmentDependency="true" />

‎devices/Yx5300/packages.lock.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
},
2323
"nanoFramework.System.IO.Ports": {
2424
"type": "Direct",
25-
"requested": "[1.1.78, 1.1.78]",
26-
"resolved": "1.1.78",
27-
"contentHash": "c+VFOAb8zrzNR9gXFAWk6HkC2eMMsHC4N6bfbrjuOF32A3xb/yEXgnh6bl4PBjSB+odXEgfYLfhuVtL5em3Olw=="
25+
"requested": "[1.1.84, 1.1.84]",
26+
"resolved": "1.1.84",
27+
"contentHash": "Md0t/qHwwheOXsAAQDznFXPPEkMTfUBNVMu+NCNEeGfaJk8PYkoRwcZDv/Ej4B2DguEO3I9RZtiCOEzrmXCZLw=="
2828
},
2929
"nanoFramework.System.IO.Streams": {
3030
"type": "Direct",
31-
"requested": "[1.1.52, 1.1.52]",
32-
"resolved": "1.1.52",
33-
"contentHash": "gdExWfWNSl4dgaIoVHHFmhLiRSKAabHA8ueHuErGAWd97qaoN2wSHCtvKqfOu1zuzyccbFpm4HBxVsh6bWMyXw=="
31+
"requested": "[1.1.59, 1.1.59]",
32+
"resolved": "1.1.59",
33+
"contentHash": "A8DSQ9ygUnhDltHsVuJjxs3aRrig9hmeEDZgAFfQ4roaaHpHS/IN1gwCEYcV+I6wfsnEnojn3FQJh43Iw07ukg=="
3434
},
3535
"nanoFramework.System.Text": {
3636
"type": "Direct",

‎devices/Yx5300/samples/Yx5300.samples.nfproj

+4-6
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,11 @@
5252
<HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.38\lib\System.Device.Gpio.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="System.IO.Ports, Version=1.1.78.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
56-
<HintPath>..\packages\nanoFramework.System.IO.Ports.1.1.78\lib\System.IO.Ports.dll</HintPath>
57-
<Private>True</Private>
55+
<Reference Include="System.IO.Ports">
56+
<HintPath>..\packages\nanoFramework.System.IO.Ports.1.1.84\lib\System.IO.Ports.dll</HintPath>
5857
</Reference>
59-
<Reference Include="System.IO.Streams, Version=1.1.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
60-
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.52\lib\System.IO.Streams.dll</HintPath>
61-
<Private>True</Private>
58+
<Reference Include="System.IO.Streams">
59+
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.59\lib\System.IO.Streams.dll</HintPath>
6260
</Reference>
6361
</ItemGroup>
6462
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />

‎devices/Yx5300/samples/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="nanoFramework.Hardware.Esp32" version="1.6.12" targetFramework="netnano1.0" />
55
<package id="nanoFramework.Runtime.Events" version="1.11.15" targetFramework="netnano1.0" />
66
<package id="nanoFramework.System.Device.Gpio" version="1.1.38" targetFramework="netnano1.0" />
7-
<package id="nanoFramework.System.IO.Ports" version="1.1.78" targetFramework="netnano1.0" />
8-
<package id="nanoFramework.System.IO.Streams" version="1.1.52" targetFramework="netnano1.0" />
7+
<package id="nanoFramework.System.IO.Ports" version="1.1.84" targetFramework="netnano1.0" />
8+
<package id="nanoFramework.System.IO.Streams" version="1.1.59" targetFramework="netnano1.0" />
99
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
1010
</packages>

‎devices/Yx5300/samples/packages.lock.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
},
2929
"nanoFramework.System.IO.Ports": {
3030
"type": "Direct",
31-
"requested": "[1.1.78, 1.1.78]",
32-
"resolved": "1.1.78",
33-
"contentHash": "c+VFOAb8zrzNR9gXFAWk6HkC2eMMsHC4N6bfbrjuOF32A3xb/yEXgnh6bl4PBjSB+odXEgfYLfhuVtL5em3Olw=="
31+
"requested": "[1.1.84, 1.1.84]",
32+
"resolved": "1.1.84",
33+
"contentHash": "Md0t/qHwwheOXsAAQDznFXPPEkMTfUBNVMu+NCNEeGfaJk8PYkoRwcZDv/Ej4B2DguEO3I9RZtiCOEzrmXCZLw=="
3434
},
3535
"nanoFramework.System.IO.Streams": {
3636
"type": "Direct",
37-
"requested": "[1.1.52, 1.1.52]",
38-
"resolved": "1.1.52",
39-
"contentHash": "gdExWfWNSl4dgaIoVHHFmhLiRSKAabHA8ueHuErGAWd97qaoN2wSHCtvKqfOu1zuzyccbFpm4HBxVsh6bWMyXw=="
37+
"requested": "[1.1.59, 1.1.59]",
38+
"resolved": "1.1.59",
39+
"contentHash": "A8DSQ9ygUnhDltHsVuJjxs3aRrig9hmeEDZgAFfQ4roaaHpHS/IN1gwCEYcV+I6wfsnEnojn3FQJh43Iw07ukg=="
4040
},
4141
"nanoFramework.System.Text": {
4242
"type": "Direct",

0 commit comments

Comments
 (0)