Skip to content

Commit ff1f530

Browse files
chkr1011chkr1011
committed
Fix nuget packages
1 parent a7753bc commit ff1f530

5 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎Core/HA4IoT.Networking/Http/Controllers/HttpRequestController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public HttpRequestController(string name, HttpServer server)
1515
if (server == null) throw new ArgumentNullException(nameof(server));
1616

1717
_baseUri = name;
18-
server.RequestReceived += ExecuteActions;
18+
server.HttpRequestReceived += ExecuteActions;
1919
}
2020

2121
public HttpRequestControllerAction Handle(HttpMethod method, string uri)

‎Core/HA4IoT.Networking/Http/HttpServer.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void Bind(int port)
3131
_log.Info($"Binded HTTP server to port {port}");
3232
}
3333

34-
public event EventHandler<HttpRequestReceivedEventArgs> RequestReceived;
34+
public event EventHandler<HttpRequestReceivedEventArgs> HttpRequestReceived;
3535
public event EventHandler<WebSocketConnectedEventArgs> WebSocketConnected;
3636

3737
public void Dispose()
@@ -42,11 +42,7 @@ public void Dispose()
4242

4343
private void HandleConnection(StreamSocketListener sender, StreamSocketListenerConnectionReceivedEventArgs args)
4444
{
45-
Task.Factory.StartNew(
46-
async () => await HandleConnectionAsync(args.Socket),
47-
_cancellationTokenSource.Token,
48-
TaskCreationOptions.LongRunning,
49-
TaskScheduler.Default);
45+
Task.Run(() => HandleConnectionAsync(args.Socket), _cancellationTokenSource.Token);
5046
}
5147

5248
private async Task HandleConnectionAsync(StreamSocket clientSocket)
@@ -85,7 +81,7 @@ private void HandleWebSocketConnected(object sender, WebSocketConnectedEventArgs
8581

8682
private void HandleHttpRequest(object sender, HttpRequestReceivedEventArgs eventArgs)
8783
{
88-
var handlerCollection = RequestReceived;
84+
var handlerCollection = HttpRequestReceived;
8985
if (handlerCollection == null)
9086
{
9187
return;

‎Core/HA4IoT/Api/LocalHttpServerService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public LocalHttpServerService(IApiDispatcherService apiDispatcherService, HttpSe
3030

3131
public override void Startup()
3232
{
33-
_httpServer.RequestReceived += DispatchHttpRequest;
33+
_httpServer.HttpRequestReceived += DispatchHttpRequest;
3434
_httpServer.WebSocketConnected += AttachWebSocket;
3535

3636
_apiDispatcherService.RegisterAdapter(this);

‎Core/HA4IoT/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.3",
4-
"MQTTnet": "2.1.0.10",
4+
"MQTTnet": "2.1.1",
55
"Newtonsoft.Json": "10.0.2",
66
"SimpleInjector": "4.0.0"
77
},

‎HA4IoT.sln‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controllers", "Controllers", "{CD5D2CCD-44D0-46E5-BE14-3B377048E0A2}"
77
EndProject
@@ -64,6 +64,7 @@ Global
6464
{D3634558-2746-441F-BC09-454B1EC7DC1D}.Release|x86 (For local).ActiveCfg = Release|x86
6565
{D3634558-2746-441F-BC09-454B1EC7DC1D}.Release|x86 (For local).Build.0 = Release|x86
6666
{D4E0A3F9-6521-4AEE-815A-E2A60323FB63}.Debug|Any CPU (For Cloud Components).ActiveCfg = Debug|Any CPU
67+
{D4E0A3F9-6521-4AEE-815A-E2A60323FB63}.Debug|Any CPU (For Cloud Components).Build.0 = Debug|Any CPU
6768
{D4E0A3F9-6521-4AEE-815A-E2A60323FB63}.Debug|ARM (For Raspberry Pi).ActiveCfg = Debug|ARM
6869
{D4E0A3F9-6521-4AEE-815A-E2A60323FB63}.Debug|ARM (For Raspberry Pi).Build.0 = Debug|ARM
6970
{D4E0A3F9-6521-4AEE-815A-E2A60323FB63}.Debug|x86 (For local).ActiveCfg = Debug|x86
@@ -116,6 +117,7 @@ Global
116117
{F46489CF-4D81-40DD-8EFB-9B4073898A85}.Release|x86 (For local).Build.0 = Release|x86
117118
{F46489CF-4D81-40DD-8EFB-9B4073898A85}.Release|x86 (For local).Deploy.0 = Release|x86
118119
{C034EC4D-46CC-490A-A045-E4D4D1F49C31}.Debug|Any CPU (For Cloud Components).ActiveCfg = Debug|Any CPU
120+
{C034EC4D-46CC-490A-A045-E4D4D1F49C31}.Debug|Any CPU (For Cloud Components).Build.0 = Debug|Any CPU
119121
{C034EC4D-46CC-490A-A045-E4D4D1F49C31}.Debug|ARM (For Raspberry Pi).ActiveCfg = Debug|ARM
120122
{C034EC4D-46CC-490A-A045-E4D4D1F49C31}.Debug|ARM (For Raspberry Pi).Build.0 = Debug|ARM
121123
{C034EC4D-46CC-490A-A045-E4D4D1F49C31}.Debug|x86 (For local).ActiveCfg = Debug|x86
@@ -138,6 +140,7 @@ Global
138140
{C4619FEF-F44F-45EE-9473-5C80BC72E866}.Release|x86 (For local).ActiveCfg = Release|Any CPU
139141
{C4619FEF-F44F-45EE-9473-5C80BC72E866}.Release|x86 (For local).Build.0 = Release|Any CPU
140142
{B10B2E2A-85CD-4289-8649-FC0C1C98921D}.Debug|Any CPU (For Cloud Components).ActiveCfg = Debug|Any CPU
143+
{B10B2E2A-85CD-4289-8649-FC0C1C98921D}.Debug|Any CPU (For Cloud Components).Build.0 = Debug|Any CPU
141144
{B10B2E2A-85CD-4289-8649-FC0C1C98921D}.Debug|Any CPU (For Cloud Components).Deploy.0 = Debug|Any CPU
142145
{B10B2E2A-85CD-4289-8649-FC0C1C98921D}.Debug|ARM (For Raspberry Pi).ActiveCfg = Debug|ARM
143146
{B10B2E2A-85CD-4289-8649-FC0C1C98921D}.Debug|ARM (For Raspberry Pi).Build.0 = Debug|ARM

0 commit comments

Comments
 (0)