Skip to content

Commit 674fd74

Browse files
josesimoesjosesimoes
authored
Merge branch 'main' into feature/device-public-key
2 parents f24dea1 + 669ec73 commit 674fd74

17 files changed

+296
-77
lines changed

‎.github/workflows/pr-checks.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (c) .NET Foundation and Contributors
2+
# See LICENSE file in the project root for full license information.
3+
4+
name: PR Checks
5+
6+
on:
7+
pull_request:
8+
9+
jobs:
10+
check_package_lock:
11+
name: nanoFramework
12+
uses: nanoframework/nf-tools/.github/workflows/check-package-lock.yml@main
13+
check_nuget_latest:
14+
name: nanoFramework
15+
uses: nanoframework/nf-tools/.github/workflows/check-packages-updated.yml@main
16+
with:
17+
solution: 'nanoFramework.System.Net.sln'
18+

‎.github/workflows/update-dependencies.yml‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,16 @@ name: Daily update dependencies
77

88
on:
99
schedule:
10-
# Update At 00:00 UTC on Tuesday and Friday
11-
- cron: '0 0 * * 2,5'
10+
# At 00:00 UTC every day.
11+
- cron: '00 00 * * *'
1212
repository_dispatch:
1313
types: update-dependencies
1414

15-
defaults:
16-
run:
17-
shell: pwsh
18-
1915
jobs:
20-
update-nuget-dependencies:
21-
name: Update .NET nanoFramework dependencies
22-
timeout-minutes: 180 # Non default as IoT devices has lots of solutions to update!
23-
runs-on: windows-latest
24-
env:
25-
GITHUB_TOKEN: ${{ github.token }}
26-
steps:
27-
- name: Checkout
28-
uses: actions/checkout@v2
29-
- name: Update dependencies
30-
uses: nanoframework/nanodu@v1
31-
with:
32-
solutionsToCheck: 'nanoFramework.System.Net.sln'
16+
update-dependencies:
17+
name: nanoFramework
18+
uses: nanoframework/nf-tools/.github/workflows/update-dependencies.yml@main
19+
with:
20+
solutionsToCheck: 'nanoFramework.System.Net.sln'
21+
secrets:
22+
githubAuth: ${{ secrets.NFBOT_GITHUB_ACTIONS }}

‎CHANGELOG.md‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,67 @@
22

33
## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/System.Net/tree/HEAD)
44

5-
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.9.0.5...HEAD)
5+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.10.14...HEAD)
6+
7+
**Documentation and other chores:**
8+
9+
- Update 1 NuGet dependencies [\#277](https://github.com/nanoframework/System.Net/pull/277)
10+
11+
## [v1.10.14](https://github.com/nanoframework/System.Net/tree/v1.10.14) (2022-09-15)
12+
13+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.10.8...v1.10.14)
14+
15+
**Documentation and other chores:**
16+
17+
- Update 1 NuGet dependencies [\#276](https://github.com/nanoframework/System.Net/pull/276)
18+
- Update 2 NuGet dependencies [\#275](https://github.com/nanoframework/System.Net/pull/275)
19+
- Update 1 NuGet dependencies [\#273](https://github.com/nanoframework/System.Net/pull/273)
20+
- Update 1 NuGet dependencies [\#272](https://github.com/nanoframework/System.Net/pull/272)
21+
- Update 1 NuGet dependencies [\#271](https://github.com/nanoframework/System.Net/pull/271)
22+
23+
## [v1.10.8](https://github.com/nanoframework/System.Net/tree/v1.10.8) (2022-08-04)
24+
25+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.10.6...v1.10.8)
26+
27+
**Documentation and other chores:**
28+
29+
- Update 1 NuGet dependencies [\#270](https://github.com/nanoframework/System.Net/pull/270)
30+
31+
## [v1.10.6](https://github.com/nanoframework/System.Net/tree/v1.10.6) (2022-08-04)
32+
33+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.10.4...v1.10.6)
34+
35+
**Documentation and other chores:**
36+
37+
- Update 1 NuGet dependencies [\#269](https://github.com/nanoframework/System.Net/pull/269)
38+
39+
## [v1.10.4](https://github.com/nanoframework/System.Net/tree/v1.10.4) (2022-08-03)
40+
41+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.10.2...v1.10.4)
42+
43+
**Documentation and other chores:**
44+
45+
- Update 1 NuGet dependencies [\#268](https://github.com/nanoframework/System.Net/pull/268)
46+
47+
## [v1.10.2](https://github.com/nanoframework/System.Net/tree/v1.10.2) (2022-08-03)
48+
49+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.9.0.10...v1.10.2)
50+
51+
**Documentation and other chores:**
52+
53+
- Update 1 NuGet dependencies [\#267](https://github.com/nanoframework/System.Net/pull/267)
54+
55+
## [v1.9.0.10](https://github.com/nanoframework/System.Net/tree/v1.9.0.10) (2022-08-03)
56+
57+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.9.0.8...v1.9.0.10)
58+
59+
**Documentation and other chores:**
60+
61+
- Update 1 NuGet dependencies [\#266](https://github.com/nanoframework/System.Net/pull/266)
62+
63+
## [v1.9.0.8](https://github.com/nanoframework/System.Net/tree/v1.9.0.8) (2022-06-13)
64+
65+
[Full Changelog](https://github.com/nanoframework/System.Net/compare/v1.9.0.5...v1.9.0.8)
666

767
**Documentation and other chores:**
868

‎Tests/IPAddressTests/IPAddressTests.nfproj‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<IsTestProject>true</IsTestProject>
2222
<TestProjectType>UnitTest</TestProjectType>
2323
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
24+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
25+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2426
</PropertyGroup>
2527
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2628
<PropertyGroup>
@@ -35,20 +37,20 @@
3537
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
3638
<Private>True</Private>
3739
</Reference>
38-
<Reference Include="nanoFramework.System.Text, Version=1.1.3.13, Culture=neutral, PublicKeyToken=c07d481e9758c731">
39-
<HintPath>..\..\packages\nanoFramework.System.Text.1.1.3.13\lib\nanoFramework.System.Text.dll</HintPath>
40+
<Reference Include="nanoFramework.System.Text, Version=1.2.7.60109, Culture=neutral, PublicKeyToken=c07d481e9758c731">
41+
<HintPath>..\..\packages\nanoFramework.System.Text.1.2.7\lib\nanoFramework.System.Text.dll</HintPath>
4042
<Private>True</Private>
4143
</Reference>
42-
<Reference Include="nanoFramework.TestFramework, Version=1.0.209.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
43-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.209\lib\nanoFramework.TestFramework.dll</HintPath>
44+
<Reference Include="nanoFramework.TestFramework, Version=2.0.43.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<HintPath>..\..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.TestFramework.dll</HintPath>
4446
<Private>True</Private>
4547
</Reference>
4648
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
47-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.209\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
49+
<HintPath>..\..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4850
<Private>True</Private>
4951
</Reference>
50-
<Reference Include="System.IO.Streams, Version=1.0.1.1, Culture=neutral, PublicKeyToken=c07d481e9758c731">
51-
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.0.1.1\lib\System.IO.Streams.dll</HintPath>
52+
<Reference Include="System.IO.Streams, Version=1.1.15.36091, Culture=neutral, PublicKeyToken=c07d481e9758c731">
53+
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.15\lib\System.IO.Streams.dll</HintPath>
5254
<Private>True</Private>
5355
</Reference>
5456
</ItemGroup>
@@ -66,11 +68,11 @@
6668
<ProjectConfigurationsDeclaredAsItems />
6769
</ProjectCapabilities>
6870
</ProjectExtensions>
69-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets')" />
71+
<Import Project="..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets')" />
7072
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7173
<PropertyGroup>
7274
<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>
7375
</PropertyGroup>
74-
<Error Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets'))" />
76+
<Error Condition="!Exists('..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets'))" />
7577
</Target>
7678
</Project>

‎Tests/IPAddressTests/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.System.IO.Streams" version="1.0.1.1" targetFramework="netnanoframework10" />
5-
<package id="nanoFramework.System.Text" version="1.1.3.13" targetFramework="netnanoframework10" />
6-
<package id="nanoFramework.TestFramework" version="1.0.209" targetFramework="netnanoframework10" developmentDependency="true" />
4+
<package id="nanoFramework.System.IO.Streams" version="1.1.15" targetFramework="netnanoframework10" />
5+
<package id="nanoFramework.System.Text" version="1.2.7" targetFramework="netnanoframework10" />
6+
<package id="nanoFramework.TestFramework" version="2.0.43" targetFramework="netnanoframework10" developmentDependency="true" />
77
</packages>

‎Tests/IPAddressTests/packages.lock.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
".NETnanoFramework,Version=v1.0": {
5+
"nanoFramework.CoreLibrary": {
6+
"type": "Direct",
7+
"requested": "[1.12.0, 1.12.0]",
8+
"resolved": "1.12.0",
9+
"contentHash": "qQrFNXmJiStMC4VXk5cVMOJp23/qlT9FW5i9i+igwQVwraQTtvpkam8yK1hj992jqrbjoCIFZP4Hw9E8H0pB7w=="
10+
},
11+
"nanoFramework.System.IO.Streams": {
12+
"type": "Direct",
13+
"requested": "[1.1.15, 1.1.15]",
14+
"resolved": "1.1.15",
15+
"contentHash": "eb7Zz3G301mgRo13n609wZvyaXZ/C9unPYn5Vz34OAEdGX1RDJufpcW+2v28ux3goj8x2BXuj717d4VVVJUotA=="
16+
},
17+
"nanoFramework.System.Text": {
18+
"type": "Direct",
19+
"requested": "[1.2.7, 1.2.7]",
20+
"resolved": "1.2.7",
21+
"contentHash": "ax4CrqYHNXoEBjaIW7dIv1CM4PxWcCc6lN2xSzGLZf7F/JZ0O7t0el86PPN2P/DfOyyBKSDAmrZjEx4q8mvgSw=="
22+
},
23+
"nanoFramework.TestFramework": {
24+
"type": "Direct",
25+
"requested": "[2.0.43, 2.0.43]",
26+
"resolved": "2.0.43",
27+
"contentHash": "HNsLJa/ZMK41A+86siZJUelZTeYWKdFm4M8tpcvtmyU52FSvBsciVJchgtgmM7XXe6A8YhT71PU1ZIV03EVmEQ=="
28+
}
29+
}
30+
}
31+
}

‎Tests/NetworkHelperTests/NetworkHelperTests.nfproj‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<IsTestProject>true</IsTestProject>
2222
<TestProjectType>UnitTest</TestProjectType>
2323
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
24+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
25+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2426
</PropertyGroup>
2527
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2628
<PropertyGroup>
@@ -44,24 +46,24 @@
4446
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
4547
<Private>True</Private>
4648
</Reference>
47-
<Reference Include="nanoFramework.System.Text, Version=1.1.3.13, Culture=neutral, PublicKeyToken=c07d481e9758c731">
48-
<HintPath>..\..\packages\nanoFramework.System.Text.1.1.3.13\lib\nanoFramework.System.Text.dll</HintPath>
49+
<Reference Include="nanoFramework.System.Text, Version=1.2.7.60109, Culture=neutral, PublicKeyToken=c07d481e9758c731">
50+
<HintPath>..\..\packages\nanoFramework.System.Text.1.2.7\lib\nanoFramework.System.Text.dll</HintPath>
4951
<Private>True</Private>
5052
</Reference>
51-
<Reference Include="nanoFramework.TestFramework, Version=1.0.209.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
52-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.209\lib\nanoFramework.TestFramework.dll</HintPath>
53+
<Reference Include="nanoFramework.TestFramework, Version=2.0.43.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
54+
<HintPath>..\..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.TestFramework.dll</HintPath>
5355
<Private>True</Private>
5456
</Reference>
5557
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
56-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.209\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
58+
<HintPath>..\..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
5759
<Private>True</Private>
5860
</Reference>
59-
<Reference Include="System.IO.Streams, Version=1.0.1.1, Culture=neutral, PublicKeyToken=c07d481e9758c731">
60-
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.0.1.1\lib\System.IO.Streams.dll</HintPath>
61+
<Reference Include="System.IO.Streams, Version=1.1.15.36091, Culture=neutral, PublicKeyToken=c07d481e9758c731">
62+
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.15\lib\System.IO.Streams.dll</HintPath>
6163
<Private>True</Private>
6264
</Reference>
63-
<Reference Include="System.Threading, Version=1.0.4.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
64-
<HintPath>..\..\packages\nanoFramework.System.Threading.1.0.4\lib\System.Threading.dll</HintPath>
65+
<Reference Include="System.Threading, Version=1.1.8.6695, Culture=neutral, PublicKeyToken=c07d481e9758c731">
66+
<HintPath>..\..\packages\nanoFramework.System.Threading.1.1.8\lib\System.Threading.dll</HintPath>
6567
<Private>True</Private>
6668
</Reference>
6769
</ItemGroup>
@@ -79,11 +81,11 @@
7981
<ProjectConfigurationsDeclaredAsItems />
8082
</ProjectCapabilities>
8183
</ProjectExtensions>
82-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets')" />
84+
<Import Project="..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets')" />
8385
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8486
<PropertyGroup>
8587
<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>
8688
</PropertyGroup>
87-
<Error Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.TestFramework.1.0.209\build\nanoFramework.TestFramework.targets'))" />
89+
<Error Condition="!Exists('..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets'))" />
8890
</Target>
8991
</Project>

‎Tests/NetworkHelperTests/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.System.IO.Streams" version="1.0.1.1" targetFramework="netnanoframework10" />
5-
<package id="nanoFramework.System.Text" version="1.1.3.13" targetFramework="netnanoframework10" />
6-
<package id="nanoFramework.System.Threading" version="1.0.4" targetFramework="netnanoframework10" />
7-
<package id="nanoFramework.TestFramework" version="1.0.209" targetFramework="netnanoframework10" developmentDependency="true" />
4+
<package id="nanoFramework.System.IO.Streams" version="1.1.15" targetFramework="netnanoframework10" />
5+
<package id="nanoFramework.System.Text" version="1.2.7" targetFramework="netnanoframework10" />
6+
<package id="nanoFramework.System.Threading" version="1.1.8" targetFramework="netnano1.0" />
7+
<package id="nanoFramework.TestFramework" version="2.0.43" targetFramework="netnanoframework10" developmentDependency="true" />
88
</packages>

‎Tests/NetworkHelperTests/packages.lock.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
".NETnanoFramework,Version=v1.0": {
5+
"nanoFramework.CoreLibrary": {
6+
"type": "Direct",
7+
"requested": "[1.12.0, 1.12.0]",
8+
"resolved": "1.12.0",
9+
"contentHash": "qQrFNXmJiStMC4VXk5cVMOJp23/qlT9FW5i9i+igwQVwraQTtvpkam8yK1hj992jqrbjoCIFZP4Hw9E8H0pB7w=="
10+
},
11+
"nanoFramework.System.IO.Streams": {
12+
"type": "Direct",
13+
"requested": "[1.1.15, 1.1.15]",
14+
"resolved": "1.1.15",
15+
"contentHash": "eb7Zz3G301mgRo13n609wZvyaXZ/C9unPYn5Vz34OAEdGX1RDJufpcW+2v28ux3goj8x2BXuj717d4VVVJUotA=="
16+
},
17+
"nanoFramework.System.Text": {
18+
"type": "Direct",
19+
"requested": "[1.2.7, 1.2.7]",
20+
"resolved": "1.2.7",
21+
"contentHash": "ax4CrqYHNXoEBjaIW7dIv1CM4PxWcCc6lN2xSzGLZf7F/JZ0O7t0el86PPN2P/DfOyyBKSDAmrZjEx4q8mvgSw=="
22+
},
23+
"nanoFramework.System.Threading": {
24+
"type": "Direct",
25+
"requested": "[1.1.8, 1.1.8]",
26+
"resolved": "1.1.8",
27+
"contentHash": "oES5GN3KHoDzifRNr06WM7P9NaQf+kDmIYkr1ETR2awmERHz4sRpECduGEatwyo1vMhMvZY/KoBcEpAyKNbDgQ=="
28+
},
29+
"nanoFramework.TestFramework": {
30+
"type": "Direct",
31+
"requested": "[2.0.43, 2.0.43]",
32+
"resolved": "2.0.43",
33+
"contentHash": "HNsLJa/ZMK41A+86siZJUelZTeYWKdFm4M8tpcvtmyU52FSvBsciVJchgtgmM7XXe6A8YhT71PU1ZIV03EVmEQ=="
34+
}
35+
}
36+
}
37+
}

0 commit comments

Comments
 (0)