Skip to content

Commit 013f630

Browse files
geoperezgeoperez
committed
Restore target NET47 because Nuget is not resolving correctly to use NetStandard 2.0 assembly.
Releasing version 1.10
1 parent 3cbddf0 commit 013f630

File tree

5 files changed

+20
-96
lines changed

5 files changed

+20
-96
lines changed

‎README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ Some notes regarding WebSocket and runtimes support:
3636

3737
| Runtime | WebSocket support | Notes |
3838
| --- | --- | --- |
39-
| NET452 | Yes | Support Windows and Linux using custom System.Net implementation based on Mono and [websocket-sharp](https://github.com/sta/websocket-sharp/). Nuget package doesn't provide this version but you can compile from Unosquare.Labs.EmbedIO.Lib solution file. This solution is to use in older environments and Mono |
4039
| NET46 | Yes | Support Win7+ OS using a custom System.Net implementation based on Mono and [websocket-sharp](https://github.com/sta/websocket-sharp/) |
41-
| NET462 | Yes | Support Win8+ OS using native System.Net library |
42-
| NETSTANDARD* | Yes | Support Windows, Linux and macOS using a custom System.Net implementation based on Mono and [websocket-sharp](https://github.com/sta/websocket-sharp/) |
40+
| NET47 | Yes | Support Win8+ OS using native System.Net library |
41+
| NETSTANDARD* | Yes | Support Windows, Linux and macOS using native System.Net library |
4342
| UAP | No | Support Windows Universal Plataform. More information [here](https://github.com/unosquare/embedio/tree/master/src/Unosquare.Labs.EmbedIO.IoT) |
4443

4544
EmbedIO before version 1.4.0 uses Newtonsoft JSON and an internal logger subsystem based on ILog interface.
@@ -50,7 +49,6 @@ NuGet Installation:
5049
PM> Install-Package EmbedIO
5150
```
5251

53-
5452
Basic Example:
5553
--------------
5654

@@ -360,4 +358,4 @@ public class WebSocketsChatServer : WebSocketsServer
360358
```
361359

362360
## Notes
363-
[1] - EmbedIO uses lowercase URL parts. In Windows systems this is the expected behaviour but in Unix systems using MONO please refer to [Mono IOMap](http://www.mono-project.com/docs/advanced/iomap/) if you want to work with case insensitive URL parts.
361+
[1] - EmbedIO uses lowercase URL parts. In Windows systems this is the expected behaviour but in Unix systems using MONO please refer to [Mono IOMap](http://www.mono-project.com/docs/advanced/iomap/) if you want to work with case insensitive URL parts.

‎src/Unosquare.Labs.EmbedIO.Samples/Unosquare.Labs.EmbedIO.Samples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net46;net47;netcoreapp2.0</TargetFrameworks>
55
<AssemblyName>Unosquare.Labs.EmbedIO.Samples</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>Unosquare.Labs.EmbedIO.Samples</PackageId>

‎src/Unosquare.Labs.EmbedIO/Unosquare.Labs.EmbedIO.csproj

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Description>A tiny, cross-platform, module based, MIT-licensed web server. Supporting .NET Framework, .NET Core and MONO.</Description>
4+
<Description>A tiny, cross-platform, module based, MIT-licensed web server. Supporting NET FX, NET Core, NET Standard and MONO.</Description>
55
<Copyright>Copyright © Unosquare 2013-2017</Copyright>
66
<AssemblyTitle>EmbedIO Web Server</AssemblyTitle>
7-
<Authors>Mario Di Vece;Geovanni Perez</Authors>
8-
<TargetFrameworks>uap10.0;netstandard1.3;net46;netstandard2.0</TargetFrameworks>
7+
<Authors>Unosquare</Authors>
8+
<TargetFrameworks>uap10.0;netstandard1.3;net46;net47;netstandard2.0</TargetFrameworks>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Unosquare.Labs.EmbedIO</AssemblyName>
11-
<PackageId>Unosquare.Labs.EmbedIO</PackageId>
11+
<PackageId>EmbedIO</PackageId>
1212
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);portable-net45+win8+wpa81+wp8</PackageTargetFallback>
1313
<CodeAnalysisRuleSet>..\..\StyleCop.Analyzers.ruleset</CodeAnalysisRuleSet>
1414
<DebugType>Full</DebugType>
15-
<Version>1.9.1</Version>
15+
<Version>1.10</Version>
16+
<Product>EmbedIO</Product>
17+
<Company>Unosquare</Company>
18+
<PackageLicenseUrl>https://raw.githubusercontent.com/unosquare/embedio/master/LICENSE</PackageLicenseUrl>
19+
<PackageProjectUrl>http://unosquare.github.io/embedio</PackageProjectUrl>
20+
<PackageIconUrl>http://unosquare.github.io/embedio/images/embedio-icon32.png</PackageIconUrl>
21+
<RepositoryUrl>https://github.com/unosquare/embedio/</RepositoryUrl>
22+
<RepositoryType>git</RepositoryType>
23+
<PackageTags>webserver websocket webapi http</PackageTags>
1624
</PropertyGroup>
1725

1826
<ItemGroup>

‎test/Unosquare.Labs.EmbedIO.Tests/Unosquare.Labs.EmbedIO.Tests.csproj

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

33
<PropertyGroup>
44
<Copyright>Copyright (c) 2016-2017 - Unosquare</Copyright>
5-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
5+
<TargetFrameworks>net46;net47;netcoreapp2.0</TargetFrameworks>
66
<TestProjectType>UnitTest</TestProjectType>
77
</PropertyGroup>
88

‎test/Unosquare.Labs.EmbedIO.Tests/WebServerTest.cs

Lines changed: 2 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -31,89 +31,7 @@ public void WebServerDefaultConstructor()
3131
Assert.IsNotNull(instance.Listener, "It has a HttpListener");
3232
Assert.IsNotNull(MimeTypes.DefaultMimeTypes, "It has MimeTypes");
3333
}
34-
35-
[Test]
36-
public void WebserverCanBeDisposed()
37-
{
38-
Assert.Ignore("This test is not longer valid, rewrite it");
39-
//var cts = new CancellationTokenSource();
40-
//var instance = new WebServer(Resources.GetServerAddress());
41-
//var task = instance.RunAsync(cts.Token);
42-
43-
//cts.Cancel();
44-
45-
//try
46-
//{
47-
// //Thread.Sleep(2000);
48-
// task.Wait();
49-
//}
50-
//catch (AggregateException e)
51-
//{
52-
// var baseEx = e.GetBaseException();
53-
// if (baseEx is OperationCanceledException)
54-
// {
55-
// instance.Dispose();
56-
// return;
57-
// }
58-
59-
// Assert.Fail($"Must have thrown OperationCanceledException and threw '{baseEx.GetType()}' instead.");
60-
//}
61-
//catch (Exception ex)
62-
//{
63-
// Assert.Fail($"Must have thrown AggregateException and threw '{ex.GetType()}' instead.");
64-
//}
65-
}
66-
67-
[Test]
68-
public void WebServerCanBeRestarted()
69-
{
70-
Assert.Ignore("This test is not longer valid, rewrite it");
71-
//var cts = new CancellationTokenSource();
72-
//var instance = new WebServer(Resources.GetServerAddress());
73-
//var task = instance.RunAsync(cts.Token);
74-
75-
////need to make a request here for it to fail before the cancellation changes, null works, yay
76-
//instance.ProcessRequest(null);
77-
78-
//cts.Cancel();
79-
80-
//try
81-
//{
82-
// //Thread.Sleep(2000);
83-
// task.Wait();
84-
//}
85-
//catch (AggregateException e)
86-
//{
87-
// var baseEx = e.GetBaseException();
88-
// if (baseEx is OperationCanceledException)
89-
// {
90-
// instance.Dispose();
91-
// return;
92-
// }
93-
//}
94-
95-
//cts = new CancellationTokenSource();
96-
//instance = new WebServer(Resources.GetServerAddress());
97-
//task = instance.RunAsync(cts.Token);
98-
99-
//cts.Cancel();
100-
101-
//try
102-
//{
103-
// //Thread.Sleep(2000);
104-
// task.Wait();
105-
//}
106-
//catch (AggregateException e)
107-
//{
108-
// var baseEx = e.GetBaseException();
109-
110-
// if (baseEx is OperationCanceledException)
111-
// {
112-
// instance.Dispose();
113-
// }
114-
//}
115-
}
116-
34+
11735
[Test]
11836
public void RegisterAndUnregisterModule()
11937
{
@@ -241,7 +159,7 @@ public async Task EncodingTest(string encodeName)
241159
}
242160
}
243161

244-
#if NET47
162+
#if NETCOREAPP2_0
245163
[Test]
246164
public async Task TestWebModuleRedirect()
247165
{

0 commit comments

Comments
 (0)