Skip to content

Commit

Permalink
Fixing dependencies mismatch (#363)
Browse files Browse the repository at this point in the history 
Co-authored-by: nfbot <[email protected]>
  • Loading branch information
@Ellerbach @nfbot
Ellerbach and nfbot authored Jan 15, 2025
1 parent 0e94ca4 commit 97df986
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 104 deletions.
20 changes: 10 additions & 10 deletions Tests/DeviceClientTests/DeviceClientTests.nfproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.M2Mqtt, Version=5.1.154.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.M2Mqtt.5.1.154\lib\nanoFramework.M2Mqtt.dll</HintPath>
<Reference Include="nanoFramework.M2Mqtt, Version=5.1.158.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.M2Mqtt.5.1.158\lib\nanoFramework.M2Mqtt.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.154.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.M2Mqtt.5.1.154\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
<Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.158.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.M2Mqtt.5.1.158\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.18.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.18\lib\nanoFramework.Runtime.Events.dll</HintPath>
Expand All @@ -58,20 +58,20 @@
<Reference Include="nanoFramework.System.Collections, Version=1.5.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Collections.1.5.45\lib\nanoFramework.System.Collections.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
<Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.TestFramework, Version=3.0.49.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.49\lib\nanoFramework.TestFramework.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.49\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
</Reference>
<Reference Include="System.IO.Streams, Version=1.1.75.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.75\lib\System.IO.Streams.dll</HintPath>
<Reference Include="System.IO.Streams, Version=1.1.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.77\lib\System.IO.Streams.dll</HintPath>
</Reference>
<Reference Include="System.Net, Version=1.11.12.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Net.1.11.12\lib\System.Net.dll</HintPath>
<Reference Include="System.Net, Version=1.11.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Net.1.11.15\lib\System.Net.dll</HintPath>
</Reference>
<Reference Include="System.Threading, Version=1.1.32.63105, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Threading.1.1.32\lib\System.Threading.dll</HintPath>
Expand Down
8 changes: 4 additions & 4 deletions Tests/DeviceClientTests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
<package id="nanoFramework.M2Mqtt" version="5.1.154" targetFramework="netnano1.0" />
<package id="nanoFramework.M2Mqtt" version="5.1.158" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.18" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Native" version="1.7.1" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Collections" version="1.5.45" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.75" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Net" version="1.11.12" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Net" version="1.11.15" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Threading" version="1.1.32" targetFramework="netnano1.0" />
<package id="nanoFramework.TestFramework" version="3.0.49" targetFramework="netnano1.0" developmentDependency="true" />
</packages>
24 changes: 12 additions & 12 deletions Tests/DeviceClientTests/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"nanoFramework.M2Mqtt": {
"type": "Direct",
"requested": "[5.1.154, 5.1.154]",
"resolved": "5.1.154",
"contentHash": "6pOPT1TfiQNdXWt3no2CGSJC2d4doK+k9BpZxv3hklOwISwH0XeKpLHpha53JR6j+1qxN1CzHOpRNVvpCdFD8w=="
"requested": "[5.1.158, 5.1.158]",
"resolved": "5.1.158",
"contentHash": "D9cbiGsrmX3Gfbrk9uA51KN0V/c0nCjLHXuecAQtOSctRx4YsRRlcrqlji2SBIYWv1uUf1jAPfbctPsxvL5VjQ=="
},
"nanoFramework.Runtime.Events": {
"type": "Direct",
Expand All @@ -34,21 +34,21 @@
},
"nanoFramework.System.IO.Streams": {
"type": "Direct",
"requested": "[1.1.75, 1.1.75]",
"resolved": "1.1.75",
"contentHash": "1wI+DeqR2osn9CRBw/DWaWB/5MBOIvaHHBLqjupW+Ew7e2neIWetOHc+J5yUGTZlxR38CgExpd1ddCXCDLtLWg=="
"requested": "[1.1.77, 1.1.77]",
"resolved": "1.1.77",
"contentHash": "zCEUBldDYkA1f02bdkz7VSLa/2NDRBtclS61ujcXs7IvfFcNF1qY2lLTCoPnznxAvJqPGoN49CbGbW9D4hJH3g=="
},
"nanoFramework.System.Net": {
"type": "Direct",
"requested": "[1.11.12, 1.11.12]",
"resolved": "1.11.12",
"contentHash": "ByDjj0b4Mx/kVq8QN/ta5lpgksUUqXo39EX64dXj10pOB58gsUhZ0EYq3Pi3Sx4lLe43e9kd+Zv/YpXI078rMA=="
"requested": "[1.11.15, 1.11.15]",
"resolved": "1.11.15",
"contentHash": "DVpqt6h01ooItNupYb9B7S+jzZWPZpqv6mTbSvKNmjZ+C0hvn8nLVb45RZaAJnq10d/UP3QEFlDRq6HnJMZkoQ=="
},
"nanoFramework.System.Text": {
"type": "Direct",
"requested": "[1.2.54, 1.2.54]",
"resolved": "1.2.54",
"contentHash": "k3OutSNRMs9di42LQ+5GbpHBY07aMEZWGkaS3Mj3ZU4cWqJc4deFGzRd+LBFQl1mRGdQaM5sl/euTZdcg8R9Zg=="
"requested": "[1.3.1, 1.3.1]",
"resolved": "1.3.1",
"contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
},
"nanoFramework.System.Threading": {
"type": "Direct",
Expand Down
4 changes: 2 additions & 2 deletions nanoFramework.Azure.Devices.Client.FullyManaged.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Use the nanoFrameowrk.Azure.Devices.Client if you want to use native wifi and MQ
<tags>nanoFramework C# csharp netmf netnf Microsoft.Azure.Devices Microsoft.Azure.Devices.Client nanoFramework.Azure.Devices.Client.FullyManaged</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="1.15.5" />
<dependency id="nanoFramework.Json" version="2.2.154" />
<dependency id="nanoFramework.M2Mqtt.Core" version="5.1.154" />
<dependency id="nanoFramework.Json" version="2.2.160" />
<dependency id="nanoFramework.M2Mqtt.Core" version="5.1.158" />
<dependency id="nanoFramework.Runtime.Native" version="1.7.1" />
<dependency id="nanoFramework.System.Threading" version="1.1.32" />
</dependencies>
Expand Down
26 changes: 13 additions & 13 deletions nanoFramework.Azure.Devices.Client.FullyManaged/Azure.Devices.Client.FullyManaged.nfproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" />
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.props')" />
<PropertyGroup Label="Globals">
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
</PropertyGroup>
Expand Down Expand Up @@ -110,26 +110,26 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="mscorlib">
<HintPath>..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Json, Version=2.2.154.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.Json.2.2.154\lib\nanoFramework.Json.dll</HintPath>
<Reference Include="nanoFramework.Json">
<HintPath>..\packages\nanoFramework.Json.2.2.160\lib\nanoFramework.Json.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.154.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.M2Mqtt.Core.5.1.154\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
<Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.158.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.M2Mqtt.Core.5.1.158\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Runtime.Native, Version=1.7.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.Runtime.Native.1.7.1\lib\nanoFramework.Runtime.Native.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.System.Collections, Version=1.5.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.Collections.1.5.45\lib\nanoFramework.System.Collections.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
<Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
</Reference>
<Reference Include="System.IO.Streams, Version=1.1.75.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.75\lib\System.IO.Streams.dll</HintPath>
<Reference Include="System.IO.Streams, Version=1.1.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.77\lib\System.IO.Streams.dll</HintPath>
</Reference>
<Reference Include="System.Threading, Version=1.1.32.63105, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.Threading.1.1.32\lib\System.Threading.dll</HintPath>
Expand All @@ -151,8 +151,8 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.props'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.targets'))" />
</Target>
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" />
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.115\build\Nerdbank.GitVersioning.targets')" />
</Project>
10 changes: 5 additions & 5 deletions nanoFramework.Azure.Devices.Client.FullyManaged/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
<package id="nanoFramework.Json" version="2.2.154" targetFramework="netnano1.0" />
<package id="nanoFramework.M2Mqtt.Core" version="5.1.154" targetFramework="netnano1.0" />
<package id="nanoFramework.Json" version="2.2.160" targetFramework="netnano1.0" />
<package id="nanoFramework.M2Mqtt.Core" version="5.1.158" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Native" version="1.7.1" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Collections" version="1.5.45" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.75" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Threading" version="1.1.32" targetFramework="netnano1.0" />
<package id="Nerdbank.GitVersioning" version="3.7.112" targetFramework="netnano1.0" developmentDependency="true" />
<package id="Nerdbank.GitVersioning" version="3.7.115" targetFramework="netnano1.0" developmentDependency="true" />
</packages>
30 changes: 15 additions & 15 deletions nanoFramework.Azure.Devices.Client.FullyManaged/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
},
"nanoFramework.Json": {
"type": "Direct",
"requested": "[2.2.154, 2.2.154]",
"resolved": "2.2.154",
"contentHash": "JfPMDuZ9HOSzPgFJzMfAqW4s0r11+SDXBxfUReqCmqWKZv/m6lAdMAOrtoAI46tJeNnaYOT5sP/K1DCLC4PgJg=="
"requested": "[2.2.160, 2.2.160]",
"resolved": "2.2.160",
"contentHash": "+mXg7/6eqhtWrGnU/+Q4Z+1HHaO3lnidRpc9V9N83mnXfdl4xSiqP4IgjtkmkPamxQJ+0BbcppkeAX11/hfn9Q=="
},
"nanoFramework.M2Mqtt.Core": {
"type": "Direct",
"requested": "[5.1.154, 5.1.154]",
"resolved": "5.1.154",
"contentHash": "dwyX1xfX6HMcJVLJunaB86aUHuguKbFleXmDzHeZm3k/wWZ5d5m9C/LH722PNPPIuekvXXNXq5CIw+vTG0wgMA=="
"requested": "[5.1.158, 5.1.158]",
"resolved": "5.1.158",
"contentHash": "Io0F9A9CBMVn4kP9ngAh1EBHzCQnRGUsvspmz1xVAm2Y0e49tJ86rb/ovMsJ+6Mvya8oolRJk3faRWT6VbsBlA=="
},
"nanoFramework.Runtime.Native": {
"type": "Direct",
Expand All @@ -34,15 +34,15 @@
},
"nanoFramework.System.IO.Streams": {
"type": "Direct",
"requested": "[1.1.75, 1.1.75]",
"resolved": "1.1.75",
"contentHash": "1wI+DeqR2osn9CRBw/DWaWB/5MBOIvaHHBLqjupW+Ew7e2neIWetOHc+J5yUGTZlxR38CgExpd1ddCXCDLtLWg=="
"requested": "[1.1.77, 1.1.77]",
"resolved": "1.1.77",
"contentHash": "zCEUBldDYkA1f02bdkz7VSLa/2NDRBtclS61ujcXs7IvfFcNF1qY2lLTCoPnznxAvJqPGoN49CbGbW9D4hJH3g=="
},
"nanoFramework.System.Text": {
"type": "Direct",
"requested": "[1.2.54, 1.2.54]",
"resolved": "1.2.54",
"contentHash": "k3OutSNRMs9di42LQ+5GbpHBY07aMEZWGkaS3Mj3ZU4cWqJc4deFGzRd+LBFQl1mRGdQaM5sl/euTZdcg8R9Zg=="
"requested": "[1.3.1, 1.3.1]",
"resolved": "1.3.1",
"contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
},
"nanoFramework.System.Threading": {
"type": "Direct",
Expand All @@ -52,9 +52,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.7.112, 3.7.112]",
"resolved": "3.7.112",
"contentHash": "j0jcfnTjvhytRanVR34Gaj6RFKk8EDmVhRW7929nWjCo8tzBxsa3XmFmbSGDA6nWXGhfehTixWhPgGWAbz+NQA=="
"requested": "[3.7.115, 3.7.115]",
"resolved": "3.7.115",
"contentHash": "EpXamaAdRfG/BMxGgvZlTM0npRnkmXUjAj8OdNKd17t4oN+2nvjdv/KnFmzOOMDqvlwB49UCwtOHJrAQTfUBtQ=="
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions nanoFramework.Azure.Devices.Client.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ This is an SDK for Azure IoT Hub using MQTT broker.</description>
<tags>nanoFramework C# csharp netmf netnf Microsoft.Azure.Devices nanoFramework.Azure.Devices</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="1.15.5" />
<dependency id="nanoFramework.Json" version="2.2.154" />
<dependency id="nanoFramework.M2Mqtt" version="5.1.154" />
<dependency id="nanoFramework.Json" version="2.2.160" />
<dependency id="nanoFramework.M2Mqtt" version="5.1.158" />
<dependency id="nanoFramework.M2Mqtt.Core" version="5.1.158" />
<dependency id="nanoFramework.System.Net.Http" version="1.5.99" />
</dependencies>
</metadata>
Expand Down
Loading

0 comments on commit 97df986

Please sign in to comment.