diff --git a/.runsettings b/.runsettings index d2930fe..fecbecb 100644 --- a/.runsettings +++ b/.runsettings @@ -1,4 +1,4 @@ - + @@ -13,5 +13,6 @@ Detailed False - + True + diff --git a/Tests/HttpUnitTests/HttpUnitTests.nfproj b/Tests/HttpUnitTests/HttpUnitTests.nfproj index efba09e..75e29db 100644 --- a/Tests/HttpUnitTests/HttpUnitTests.nfproj +++ b/Tests/HttpUnitTests/HttpUnitTests.nfproj @@ -44,20 +44,20 @@ - - ..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll + + ..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll - - ..\..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll + + ..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll - - ..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll + + ..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\nanoFramework.TestFramework.dll - ..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe + ..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\nanoFramework.UnitTestLauncher.exe - - ..\..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll + + ..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll diff --git a/Tests/HttpUnitTests/StreamContentTest.cs b/Tests/HttpUnitTests/StreamContentTest.cs index c294d95..7edaf9b 100644 --- a/Tests/HttpUnitTests/StreamContentTest.cs +++ b/Tests/HttpUnitTests/StreamContentTest.cs @@ -317,7 +317,7 @@ public void ContentReadStream_CheckResultProperties_ValuesRepresentReadOnlyStrea Assert.AreEqual(data[5], byteOnIndex5[0]); byte[] byteOnIndex6 = new byte[1]; - Assert.AreEqual(1, contentReadStream.Read(new SpanByte(byteOnIndex6, 0, 1))); + Assert.AreEqual(1, contentReadStream.Read(new Span(byteOnIndex6, 0, 1))); Assert.AreEqual(data[6], byteOnIndex6[0]); contentReadStream.ReadTimeout = 123; diff --git a/Tests/HttpUnitTests/nano.runsettings b/Tests/HttpUnitTests/nano.runsettings deleted file mode 100644 index e82b99e..0000000 --- a/Tests/HttpUnitTests/nano.runsettings +++ /dev/null @@ -1,15 +0,0 @@ - - - - - 1 - .\TestResults - 120000 - net48 - x64 - - - None - False - - \ No newline at end of file diff --git a/Tests/HttpUnitTests/packages.config b/Tests/HttpUnitTests/packages.config index edfe4fd..661dfc6 100644 --- a/Tests/HttpUnitTests/packages.config +++ b/Tests/HttpUnitTests/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/Tests/HttpUnitTests/packages.lock.json b/Tests/HttpUnitTests/packages.lock.json index 3a4b31a..dcc9a74 100644 --- a/Tests/HttpUnitTests/packages.lock.json +++ b/Tests/HttpUnitTests/packages.lock.json @@ -4,27 +4,27 @@ ".NETnanoFramework,Version=v1.0": { "nanoFramework.CoreLibrary": { "type": "Direct", - "requested": "[1.17.11, 1.17.11]", - "resolved": "1.17.11", - "contentHash": "HezzAc0o2XrSGf85xSeD/6xsO6ohF9hX6/iMQ1IZS6Zw6umr4WfAN2Jv0BrPxkaYwzEegJxxZujkHoUIAqtOMw==" + "requested": "[2.0.0-preview.49, 2.0.0-preview.49]", + "resolved": "2.0.0-preview.49", + "contentHash": "/8/fw1qqEql05aelTR9QQi4ZF2M+Mdwuemjf9rul8yaOpl6jjnhhKfdRJMh4+BXp5VjwTZsALJVpp2aN+e7vzw==" }, "nanoFramework.System.IO.Streams": { "type": "Direct", - "requested": "[1.1.96, 1.1.96]", - "resolved": "1.1.96", - "contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg==" }, "nanoFramework.System.Text": { "type": "Direct", - "requested": "[1.3.42, 1.3.42]", - "resolved": "1.3.42", - "contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ==" }, "nanoFramework.TestFramework": { "type": "Direct", - "requested": "[3.0.77, 3.0.77]", - "resolved": "3.0.77", - "contentHash": "Py5W1oN84KMBmOOHCzdz6pyi3bZTnQu9BoqIx0KGqkhG3V8kGoem/t+BuCM0pMIWAyl2iMP1n2S9624YXmBJZw==" + "requested": "[4.0.0-preview.52, 4.0.0-preview.52]", + "resolved": "4.0.0-preview.52", + "contentHash": "NnPJcRP41jr5pC8O5Zc29ozBAIm0PEXcj/vc/IjzWzsdNq1cpx8aRAoF3TW9cFEHdLu223tahoZyjFmALRSEoA==" } } } diff --git a/nanoFramework.System.Net.Http.Client.nuspec b/nanoFramework.System.Net.Http.Client.nuspec index e28dc89..379eaaa 100644 --- a/nanoFramework.System.Net.Http.Client.nuspec +++ b/nanoFramework.System.Net.Http.Client.nuspec @@ -20,12 +20,12 @@ There is also a package with the server API only and another with the full API.< nanoFramework C# csharp netmf netnf http https - - - - - - + + + + + + @@ -36,4 +36,4 @@ There is also a package with the server API only and another with the full API.< - + \ No newline at end of file diff --git a/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj b/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj index 3a95e36..3a83dc0 100644 --- a/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj +++ b/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj @@ -209,26 +209,26 @@ - - ..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll + + ..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll - - ..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll + + ..\packages\nanoFramework.Runtime.Events.2.0.0-preview.12\lib\netnano1.0\nanoFramework.Runtime.Events.dll - - ..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll + + ..\packages\nanoFramework.System.Collections.2.0.0-preview.14\lib\netnano1.0\nanoFramework.System.Collections.dll - - ..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll + + ..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll - - ..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll + + ..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll - - ..\packages\nanoFramework.System.Net.1.11.47\lib\System.Net.dll + + ..\packages\nanoFramework.System.Net.2.0.0-preview.14\lib\netnano1.0\System.Net.dll - - ..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll + + ..\packages\nanoFramework.System.Threading.2.0.0-preview.9\lib\netnano1.0\System.Threading.dll diff --git a/nanoFramework.System.Net.Http.Client/packages.config b/nanoFramework.System.Net.Http.Client/packages.config index 196d06f..fe2742a 100644 --- a/nanoFramework.System.Net.Http.Client/packages.config +++ b/nanoFramework.System.Net.Http.Client/packages.config @@ -1,11 +1,11 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/nanoFramework.System.Net.Http.Client/packages.lock.json b/nanoFramework.System.Net.Http.Client/packages.lock.json index 36c84f6..fff87d0 100644 --- a/nanoFramework.System.Net.Http.Client/packages.lock.json +++ b/nanoFramework.System.Net.Http.Client/packages.lock.json @@ -4,45 +4,45 @@ ".NETnanoFramework,Version=v1.0": { "nanoFramework.CoreLibrary": { "type": "Direct", - "requested": "[1.17.11, 1.17.11]", - "resolved": "1.17.11", - "contentHash": "HezzAc0o2XrSGf85xSeD/6xsO6ohF9hX6/iMQ1IZS6Zw6umr4WfAN2Jv0BrPxkaYwzEegJxxZujkHoUIAqtOMw==" + "requested": "[2.0.0-preview.49, 2.0.0-preview.49]", + "resolved": "2.0.0-preview.49", + "contentHash": "/8/fw1qqEql05aelTR9QQi4ZF2M+Mdwuemjf9rul8yaOpl6jjnhhKfdRJMh4+BXp5VjwTZsALJVpp2aN+e7vzw==" }, "nanoFramework.Runtime.Events": { "type": "Direct", - "requested": "[1.11.32, 1.11.32]", - "resolved": "1.11.32", - "contentHash": "NyLUIwJDlpl5VKSd+ljmdDtO2WHHBvPvruo1ccaL+hd79z+6XMYze1AccOVXKGiZenLBCwDmFHwpgIQyHkM7GA==" + "requested": "[2.0.0-preview.12, 2.0.0-preview.12]", + "resolved": "2.0.0-preview.12", + "contentHash": "49clC9iMibQ7Sm73xShGsKqjee54JZ7QGuxys1wPkG2tvHIziGtb51U+RxdfdVGz/UtSv9q5ebqo0IYlk7BFxw==" }, "nanoFramework.System.Collections": { "type": "Direct", - "requested": "[1.5.67, 1.5.67]", - "resolved": "1.5.67", - "contentHash": "MjSipUB70vrxjqTm1KfKTUqqjd0wbweiNyYFXONi0XClrH6HXsuX2lhDqXM8NWuYnWyYOqx8y20sXbvsH+4brg==" + "requested": "[2.0.0-preview.14, 2.0.0-preview.14]", + "resolved": "2.0.0-preview.14", + "contentHash": "bD/aprDzvUS7UGXXnP1NxY2fVw2686gNtiDXt1CV3IMA6YKu7cGXdPXfO8RYDkPNkHJ8omuHNuyUaq0OhJH82g==" }, "nanoFramework.System.IO.Streams": { "type": "Direct", - "requested": "[1.1.96, 1.1.96]", - "resolved": "1.1.96", - "contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg==" }, "nanoFramework.System.Net": { "type": "Direct", - "requested": "[1.11.47, 1.11.47]", - "resolved": "1.11.47", - "contentHash": "fPjTPfaqDiirh9AysBLlEX5/KbaOliSxyspwpBTcM5OupCNjVXz0aZ9fOWex+BMjZei6GpG74kP8Z4ml912pcw==" + "requested": "[2.0.0-preview.14, 2.0.0-preview.14]", + "resolved": "2.0.0-preview.14", + "contentHash": "xxbJtU2xYlTY3b/rNelow9TnO0qXTaCCZQ5J8X2mpjJNyULu4PVFECdwBfiJNlg7+ByD4nhTOnyPlbVuQRvH0Q==" }, "nanoFramework.System.Text": { "type": "Direct", - "requested": "[1.3.42, 1.3.42]", - "resolved": "1.3.42", - "contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ==" }, "nanoFramework.System.Threading": { "type": "Direct", - "requested": "[1.1.52, 1.1.52]", - "resolved": "1.1.52", - "contentHash": "kv+US/+7QKV1iT/snxBh032vwZ+3krJ4vujlSsvmS2nNj/nK64R3bq/ST3bCFquxHDD0mog8irtCBCsFazr4kA==" + "requested": "[2.0.0-preview.9, 2.0.0-preview.9]", + "resolved": "2.0.0-preview.9", + "contentHash": "5bn3gYlNFhufVyypUUoBbmVZm3l502UikPvS4JbHJZXeEzWpUVBLUlcMOP9s9zFtinZ8F8KJixYFJaDKvvn5UQ==" }, "Nerdbank.GitVersioning": { "type": "Direct", diff --git a/nanoFramework.System.Net.Http.Server.nuspec b/nanoFramework.System.Net.Http.Server.nuspec index 80cbfae..71a68cf 100644 --- a/nanoFramework.System.Net.Http.Server.nuspec +++ b/nanoFramework.System.Net.Http.Server.nuspec @@ -20,12 +20,12 @@ There is also a package with the client API only and another with the full API.< nanoFramework C# csharp netmf netnf http https - - - - - - + + + + + + @@ -36,4 +36,4 @@ There is also a package with the client API only and another with the full API.< - + \ No newline at end of file diff --git a/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj b/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj index 47ef3b8..806d3ac 100644 --- a/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj +++ b/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj @@ -135,26 +135,26 @@ - - ..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll + + ..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll - - ..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll + + ..\packages\nanoFramework.Runtime.Events.2.0.0-preview.12\lib\netnano1.0\nanoFramework.Runtime.Events.dll - - ..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll + + ..\packages\nanoFramework.System.Collections.2.0.0-preview.14\lib\netnano1.0\nanoFramework.System.Collections.dll - - ..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll + + ..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll - - ..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll + + ..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll - - ..\packages\nanoFramework.System.Net.1.11.47\lib\System.Net.dll + + ..\packages\nanoFramework.System.Net.2.0.0-preview.14\lib\netnano1.0\System.Net.dll - - ..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll + + ..\packages\nanoFramework.System.Threading.2.0.0-preview.9\lib\netnano1.0\System.Threading.dll diff --git a/nanoFramework.System.Net.Http.Server/packages.config b/nanoFramework.System.Net.Http.Server/packages.config index 196d06f..fe2742a 100644 --- a/nanoFramework.System.Net.Http.Server/packages.config +++ b/nanoFramework.System.Net.Http.Server/packages.config @@ -1,11 +1,11 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/nanoFramework.System.Net.Http.Server/packages.lock.json b/nanoFramework.System.Net.Http.Server/packages.lock.json index 36c84f6..fff87d0 100644 --- a/nanoFramework.System.Net.Http.Server/packages.lock.json +++ b/nanoFramework.System.Net.Http.Server/packages.lock.json @@ -4,45 +4,45 @@ ".NETnanoFramework,Version=v1.0": { "nanoFramework.CoreLibrary": { "type": "Direct", - "requested": "[1.17.11, 1.17.11]", - "resolved": "1.17.11", - "contentHash": "HezzAc0o2XrSGf85xSeD/6xsO6ohF9hX6/iMQ1IZS6Zw6umr4WfAN2Jv0BrPxkaYwzEegJxxZujkHoUIAqtOMw==" + "requested": "[2.0.0-preview.49, 2.0.0-preview.49]", + "resolved": "2.0.0-preview.49", + "contentHash": "/8/fw1qqEql05aelTR9QQi4ZF2M+Mdwuemjf9rul8yaOpl6jjnhhKfdRJMh4+BXp5VjwTZsALJVpp2aN+e7vzw==" }, "nanoFramework.Runtime.Events": { "type": "Direct", - "requested": "[1.11.32, 1.11.32]", - "resolved": "1.11.32", - "contentHash": "NyLUIwJDlpl5VKSd+ljmdDtO2WHHBvPvruo1ccaL+hd79z+6XMYze1AccOVXKGiZenLBCwDmFHwpgIQyHkM7GA==" + "requested": "[2.0.0-preview.12, 2.0.0-preview.12]", + "resolved": "2.0.0-preview.12", + "contentHash": "49clC9iMibQ7Sm73xShGsKqjee54JZ7QGuxys1wPkG2tvHIziGtb51U+RxdfdVGz/UtSv9q5ebqo0IYlk7BFxw==" }, "nanoFramework.System.Collections": { "type": "Direct", - "requested": "[1.5.67, 1.5.67]", - "resolved": "1.5.67", - "contentHash": "MjSipUB70vrxjqTm1KfKTUqqjd0wbweiNyYFXONi0XClrH6HXsuX2lhDqXM8NWuYnWyYOqx8y20sXbvsH+4brg==" + "requested": "[2.0.0-preview.14, 2.0.0-preview.14]", + "resolved": "2.0.0-preview.14", + "contentHash": "bD/aprDzvUS7UGXXnP1NxY2fVw2686gNtiDXt1CV3IMA6YKu7cGXdPXfO8RYDkPNkHJ8omuHNuyUaq0OhJH82g==" }, "nanoFramework.System.IO.Streams": { "type": "Direct", - "requested": "[1.1.96, 1.1.96]", - "resolved": "1.1.96", - "contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg==" }, "nanoFramework.System.Net": { "type": "Direct", - "requested": "[1.11.47, 1.11.47]", - "resolved": "1.11.47", - "contentHash": "fPjTPfaqDiirh9AysBLlEX5/KbaOliSxyspwpBTcM5OupCNjVXz0aZ9fOWex+BMjZei6GpG74kP8Z4ml912pcw==" + "requested": "[2.0.0-preview.14, 2.0.0-preview.14]", + "resolved": "2.0.0-preview.14", + "contentHash": "xxbJtU2xYlTY3b/rNelow9TnO0qXTaCCZQ5J8X2mpjJNyULu4PVFECdwBfiJNlg7+ByD4nhTOnyPlbVuQRvH0Q==" }, "nanoFramework.System.Text": { "type": "Direct", - "requested": "[1.3.42, 1.3.42]", - "resolved": "1.3.42", - "contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ==" }, "nanoFramework.System.Threading": { "type": "Direct", - "requested": "[1.1.52, 1.1.52]", - "resolved": "1.1.52", - "contentHash": "kv+US/+7QKV1iT/snxBh032vwZ+3krJ4vujlSsvmS2nNj/nK64R3bq/ST3bCFquxHDD0mog8irtCBCsFazr4kA==" + "requested": "[2.0.0-preview.9, 2.0.0-preview.9]", + "resolved": "2.0.0-preview.9", + "contentHash": "5bn3gYlNFhufVyypUUoBbmVZm3l502UikPvS4JbHJZXeEzWpUVBLUlcMOP9s9zFtinZ8F8KJixYFJaDKvvn5UQ==" }, "Nerdbank.GitVersioning": { "type": "Direct", diff --git a/nanoFramework.System.Net.Http.nuspec b/nanoFramework.System.Net.Http.nuspec index aedcb91..d2e5a41 100644 --- a/nanoFramework.System.Net.Http.nuspec +++ b/nanoFramework.System.Net.Http.nuspec @@ -20,12 +20,12 @@ There are also two other packages with just the client API and just the server A These are meant to be used when there is the need to use smaller assemblies. nanoFramework C# csharp netmf netnf http https - - - - - - + + + + + + diff --git a/nanoFramework.System.Net.Http/Http/ReadOnlyStream.cs b/nanoFramework.System.Net.Http/Http/ReadOnlyStream.cs index 0fc9187..ce74195 100644 --- a/nanoFramework.System.Net.Http/Http/ReadOnlyStream.cs +++ b/nanoFramework.System.Net.Http/Http/ReadOnlyStream.cs @@ -86,7 +86,7 @@ protected override void Dispose(bool disposing) public override void Flush() => throw new NotSupportedException(); /// - public override int Read(SpanByte buffer) + public override int Read(Span buffer) { return _innerStream.Read(buffer); } @@ -121,6 +121,12 @@ public override void SetLength(long value) => public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(); + /// + /// Writing to a read-only stream is not supported. + /// Always thrown when called. + public override void Write(ReadOnlySpan buffer) => + throw new NotSupportedException(); + /// /// Writing a byte to a read-only stream is not supported. /// Always thrown when called. diff --git a/nanoFramework.System.Net.Http/Http/System.Net._InputNetworkStreamWrapper.cs b/nanoFramework.System.Net.Http/Http/System.Net._InputNetworkStreamWrapper.cs index 8b15af3..fca760d 100644 --- a/nanoFramework.System.Net.Http/Http/System.Net._InputNetworkStreamWrapper.cs +++ b/nanoFramework.System.Net.Http/Http/System.Net._InputNetworkStreamWrapper.cs @@ -375,7 +375,7 @@ public int ReadInternal(byte[] buffer, int offset, int size) /// /// /// In 'HTTP/1.0' mode, where the content length is not transmitted in the response header and the server closes the connection to mark the end of the body. - /// (see: RFC9112, §6.3, point 8, https://www.rfc-editor.org/rfc/rfc9112#name-message-body-length) + /// (see: RFC9112, section 6.3, point 8, https://www.rfc-editor.org/rfc/rfc9112#name-message-body-length) /// private bool IsHttp1_0Completed() { @@ -396,6 +396,16 @@ public override void Write(byte[] buffer, int offset, int count) m_Stream.Write(buffer, offset, count); } + /// + /// Impletments Write for the stream. + /// Since we do not have write buffering, all we do is delegate to the m_Stream. + /// + /// Buffer to write + public override void Write(ReadOnlySpan buffer) + { + m_Stream.Write(buffer); + } + /// /// Since we do not have write buffering, all we do is delegate to the m_Stream. /// @@ -776,7 +786,7 @@ private Chunk GetChunk() return nextChunk; } - public override int Read(SpanByte buffer) + public override int Read(Span buffer) { throw new NotSupportedException(); } diff --git a/nanoFramework.System.Net.Http/Http/System.Net._OutputNetworkStreamWrapper.cs b/nanoFramework.System.Net.Http/Http/System.Net._OutputNetworkStreamWrapper.cs index 7f02c83..fa0d02d 100644 --- a/nanoFramework.System.Net.Http/Http/System.Net._OutputNetworkStreamWrapper.cs +++ b/nanoFramework.System.Net.Http/Http/System.Net._OutputNetworkStreamWrapper.cs @@ -287,7 +287,24 @@ public override void Write(byte[] buffer, int offset, int size) } } - public override int Read(SpanByte buffer) + /// + /// Re-implements writing of data to network stream. + /// The only functionality - on first write it sends HTTP headers. + /// Then calls base. + /// + /// Buffer with data to write to HTTP client. + public override void Write(ReadOnlySpan buffer) + { + byte[] tempBuffer = new byte[buffer.Length]; + for (int i = 0; i < buffer.Length; i++) + { + tempBuffer[i] = buffer[i]; + } + + Write(tempBuffer, 0, tempBuffer.Length); + } + + public override int Read(Span buffer) { throw new NotSupportedException(); } diff --git a/nanoFramework.System.Net.Http/System.Net.Http.nfproj b/nanoFramework.System.Net.Http/System.Net.Http.nfproj index c7107be..83fec57 100644 --- a/nanoFramework.System.Net.Http/System.Net.Http.nfproj +++ b/nanoFramework.System.Net.Http/System.Net.Http.nfproj @@ -109,26 +109,26 @@ - - ..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll + + ..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll - - ..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll + + ..\packages\nanoFramework.Runtime.Events.2.0.0-preview.12\lib\netnano1.0\nanoFramework.Runtime.Events.dll - - ..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll + + ..\packages\nanoFramework.System.Collections.2.0.0-preview.14\lib\netnano1.0\nanoFramework.System.Collections.dll - - ..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll + + ..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll - - ..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll + + ..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll - - ..\packages\nanoFramework.System.Net.1.11.47\lib\System.Net.dll + + ..\packages\nanoFramework.System.Net.2.0.0-preview.14\lib\netnano1.0\System.Net.dll - - ..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll + + ..\packages\nanoFramework.System.Threading.2.0.0-preview.9\lib\netnano1.0\System.Threading.dll diff --git a/nanoFramework.System.Net.Http/packages.config b/nanoFramework.System.Net.Http/packages.config index 196d06f..fe2742a 100644 --- a/nanoFramework.System.Net.Http/packages.config +++ b/nanoFramework.System.Net.Http/packages.config @@ -1,11 +1,11 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/nanoFramework.System.Net.Http/packages.lock.json b/nanoFramework.System.Net.Http/packages.lock.json index 36c84f6..fff87d0 100644 --- a/nanoFramework.System.Net.Http/packages.lock.json +++ b/nanoFramework.System.Net.Http/packages.lock.json @@ -4,45 +4,45 @@ ".NETnanoFramework,Version=v1.0": { "nanoFramework.CoreLibrary": { "type": "Direct", - "requested": "[1.17.11, 1.17.11]", - "resolved": "1.17.11", - "contentHash": "HezzAc0o2XrSGf85xSeD/6xsO6ohF9hX6/iMQ1IZS6Zw6umr4WfAN2Jv0BrPxkaYwzEegJxxZujkHoUIAqtOMw==" + "requested": "[2.0.0-preview.49, 2.0.0-preview.49]", + "resolved": "2.0.0-preview.49", + "contentHash": "/8/fw1qqEql05aelTR9QQi4ZF2M+Mdwuemjf9rul8yaOpl6jjnhhKfdRJMh4+BXp5VjwTZsALJVpp2aN+e7vzw==" }, "nanoFramework.Runtime.Events": { "type": "Direct", - "requested": "[1.11.32, 1.11.32]", - "resolved": "1.11.32", - "contentHash": "NyLUIwJDlpl5VKSd+ljmdDtO2WHHBvPvruo1ccaL+hd79z+6XMYze1AccOVXKGiZenLBCwDmFHwpgIQyHkM7GA==" + "requested": "[2.0.0-preview.12, 2.0.0-preview.12]", + "resolved": "2.0.0-preview.12", + "contentHash": "49clC9iMibQ7Sm73xShGsKqjee54JZ7QGuxys1wPkG2tvHIziGtb51U+RxdfdVGz/UtSv9q5ebqo0IYlk7BFxw==" }, "nanoFramework.System.Collections": { "type": "Direct", - "requested": "[1.5.67, 1.5.67]", - "resolved": "1.5.67", - "contentHash": "MjSipUB70vrxjqTm1KfKTUqqjd0wbweiNyYFXONi0XClrH6HXsuX2lhDqXM8NWuYnWyYOqx8y20sXbvsH+4brg==" + "requested": "[2.0.0-preview.14, 2.0.0-preview.14]", + "resolved": "2.0.0-preview.14", + "contentHash": "bD/aprDzvUS7UGXXnP1NxY2fVw2686gNtiDXt1CV3IMA6YKu7cGXdPXfO8RYDkPNkHJ8omuHNuyUaq0OhJH82g==" }, "nanoFramework.System.IO.Streams": { "type": "Direct", - "requested": "[1.1.96, 1.1.96]", - "resolved": "1.1.96", - "contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg==" }, "nanoFramework.System.Net": { "type": "Direct", - "requested": "[1.11.47, 1.11.47]", - "resolved": "1.11.47", - "contentHash": "fPjTPfaqDiirh9AysBLlEX5/KbaOliSxyspwpBTcM5OupCNjVXz0aZ9fOWex+BMjZei6GpG74kP8Z4ml912pcw==" + "requested": "[2.0.0-preview.14, 2.0.0-preview.14]", + "resolved": "2.0.0-preview.14", + "contentHash": "xxbJtU2xYlTY3b/rNelow9TnO0qXTaCCZQ5J8X2mpjJNyULu4PVFECdwBfiJNlg7+ByD4nhTOnyPlbVuQRvH0Q==" }, "nanoFramework.System.Text": { "type": "Direct", - "requested": "[1.3.42, 1.3.42]", - "resolved": "1.3.42", - "contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A==" + "requested": "[2.0.0-preview.18, 2.0.0-preview.18]", + "resolved": "2.0.0-preview.18", + "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ==" }, "nanoFramework.System.Threading": { "type": "Direct", - "requested": "[1.1.52, 1.1.52]", - "resolved": "1.1.52", - "contentHash": "kv+US/+7QKV1iT/snxBh032vwZ+3krJ4vujlSsvmS2nNj/nK64R3bq/ST3bCFquxHDD0mog8irtCBCsFazr4kA==" + "requested": "[2.0.0-preview.9, 2.0.0-preview.9]", + "resolved": "2.0.0-preview.9", + "contentHash": "5bn3gYlNFhufVyypUUoBbmVZm3l502UikPvS4JbHJZXeEzWpUVBLUlcMOP9s9zFtinZ8F8KJixYFJaDKvvn5UQ==" }, "Nerdbank.GitVersioning": { "type": "Direct",