Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Tests/SslStreamTests_WiFi/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# DEVELOPER NOTE

Project SslStreamTests_WiFi is not building nor configured because it depends on System.Device.Wifi, which in turn, depends on System.Net.
In order to build and run the tests in this project, you need to add a reference to System.Device.Wifi to it.
14 changes: 6 additions & 8 deletions Tests/SslStreamTests_WiFi/SslStreamTests_WiFi.nfproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.39.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.39\lib\nanoFramework.Runtime.Events.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
</Reference>
Expand All @@ -48,12 +51,6 @@
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.80\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.37\lib\nanoFramework.Runtime.Events.dll</HintPath>
</Reference>
<Reference Include="System.Device.Wifi, Version=1.5.149.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.Device.Wifi.1.5.149\lib\System.Device.Wifi.dll</HintPath>
</Reference>
<Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
</Reference>
Expand All @@ -63,9 +60,10 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\nanoFramework.System.Net\System.Net.nfproj" />
<Content Include="packages.lock.json" />
</ItemGroup>
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
<!--
Expand Down Expand Up @@ -109,4 +107,4 @@
<ProjectConfigurationsDeclaredAsItems />
</ProjectCapabilities>
</ProjectExtensions>
</Project>
</Project>
5 changes: 2 additions & 3 deletions Tests/SslStreamTests_WiFi/packages.config
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.37" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Wifi" version="1.5.149" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.39" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
<package id="nanoFramework.TestFramework" version="3.0.80" targetFramework="netnano1.0" developmentDependency="true" />
</packages>
</packages>
14 changes: 4 additions & 10 deletions Tests/SslStreamTests_WiFi/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@
},
"nanoFramework.Runtime.Events": {
"type": "Direct",
"requested": "[1.11.37, 1.11.37]",
"resolved": "1.11.37",
"contentHash": "whTgEJCGpE8eGK7Z2fI6gTqsVeVrnCzP1KDSqIB2PY0/Jyw7NcnwCFe3s/43ch75DuAZt8/jTX0VJoJtN0Colw=="
},
"nanoFramework.System.Device.Wifi": {
"type": "Direct",
"requested": "[1.5.149, 1.5.149]",
"resolved": "1.5.149",
"contentHash": "bOceF44zpOACFYIbFTBO+Pxm8H0pg7C3AM5zzUs4wA0DiG/RB5HqKeBTUD0mpu0PTyCERsByDQMK6Pz6h1SBuw=="
"requested": "[1.11.39, 1.11.39]",
"resolved": "1.11.39",
"contentHash": "qNcgsk1QU5lTj2MgMYyF4iTx85YjFcAfJP9sYYydUlEXL1JaO2MnKGI3oBG4p20dJ1Fqi1ClIgKXJfAp9z80tA=="
},
"nanoFramework.System.IO.Streams": {
"type": "Direct",
Expand Down Expand Up @@ -46,4 +40,4 @@
}
}
}
}
}
5 changes: 2 additions & 3 deletions nanoFramework.System.Net.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ This package requires a target with System.Net v$nativeVersion$ (checksum $check
<tags>nanoFramework C# csharp netmf netnf networking</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="1.17.11" />
<dependency id="nanoFramework.Runtime.Events" version="1.11.37" />
<dependency id="nanoFramework.System.Text" version="1.3.42" />
<dependency id="nanoFramework.Runtime.Events" version="1.11.39" />
<dependency id="nanoFramework.System.Threading" version="1.1.52" />
<dependency id="nanoFramework.System.IO.Streams" version="1.1.96" />
</dependencies>
Expand All @@ -37,4 +36,4 @@ This package requires a target with System.Net v$nativeVersion$ (checksum $check
<file src="assets\nf-logo.png" target="images" />
<file src="LICENSE.md" target="" />
</files>
</package>
</package>
4 changes: 0 additions & 4 deletions nanoFramework.System.Net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ Global
{6233288D-091E-4795-AA1B-FD069B7F6305}.Release|Any CPU.Build.0 = Release|Any CPU
{6233288D-091E-4795-AA1B-FD069B7F6305}.Release|Any CPU.Deploy.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Deploy.0 = Release|Any CPU
{B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down
15 changes: 7 additions & 8 deletions nanoFramework.System.Net/System.Net.nfproj
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.10.91\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.91\build\Nerdbank.GitVersioning.props')" />
<Import Project="..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props')" />
<PropertyGroup Label="Globals">
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
</PropertyGroup>
Expand All @@ -12,8 +12,7 @@
<ProjectGuid>474A90F4-FA98-4011-AABB-7DAC8E218E6A</ProjectGuid>
<OutputType>Library</OutputType>
<FileAlignment>512</FileAlignment>
<RootNamespace>
</RootNamespace>
<RootNamespace></RootNamespace>
<AssemblyName>System.Net</AssemblyName>
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
<NF_IsCoreLibrary>True</NF_IsCoreLibrary>
Expand Down Expand Up @@ -135,8 +134,8 @@
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.Runtime.Events.1.11.37\lib\nanoFramework.Runtime.Events.dll</HintPath>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.39.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.Runtime.Events.1.11.39\lib\nanoFramework.Runtime.Events.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
Expand All @@ -158,8 +157,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.10.91\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.91\build\Nerdbank.GitVersioning.props'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.10.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.91\build\Nerdbank.GitVersioning.targets'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets'))" />
</Target>
<Import Project="..\packages\Nerdbank.GitVersioning.3.10.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.91\build\Nerdbank.GitVersioning.targets')" />
<Import Project="..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets')" />
</Project>
4 changes: 2 additions & 2 deletions nanoFramework.System.Net/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.37" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.39" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
<package id="Nerdbank.GitVersioning" version="3.10.91" developmentDependency="true" targetFramework="netnano1.0" />
<package id="Nerdbank.GitVersioning" version="3.10.94" developmentDependency="true" targetFramework="netnano1.0" />
</packages>
12 changes: 6 additions & 6 deletions nanoFramework.System.Net/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"nanoFramework.Runtime.Events": {
"type": "Direct",
"requested": "[1.11.37, 1.11.37]",
"resolved": "1.11.37",
"contentHash": "whTgEJCGpE8eGK7Z2fI6gTqsVeVrnCzP1KDSqIB2PY0/Jyw7NcnwCFe3s/43ch75DuAZt8/jTX0VJoJtN0Colw=="
"requested": "[1.11.39, 1.11.39]",
"resolved": "1.11.39",
"contentHash": "qNcgsk1QU5lTj2MgMYyF4iTx85YjFcAfJP9sYYydUlEXL1JaO2MnKGI3oBG4p20dJ1Fqi1ClIgKXJfAp9z80tA=="
},
"nanoFramework.System.IO.Streams": {
"type": "Direct",
Expand All @@ -34,9 +34,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.10.91, 3.10.91]",
"resolved": "3.10.91",
"contentHash": "9MtEXm/um2lQAEoek1EkF4CXNH4JuXxv2jV3Ew2XlzP0LXxFaFiECS7ji8zf1ZaMnPGYbbom+Nm6y4ADc5HNHQ=="
"requested": "[3.10.94, 3.10.94]",
"resolved": "3.10.94",
"contentHash": "sn6gFIx6bwFj3Me0XGmek3gLZi/MZC8C4tRLwslXGeBcXcVxvFpZyDrQA93G8TiYgxTS7J7triKB7hj5wXzSxA=="
}
}
}
Expand Down