Skip to content

Commit 6c91123

Browse files
committed
Move JsonOptions into EasyFramework, update that
This will add a context menu to the tray icon as well
1 parent 6c58a65 commit 6c91123

File tree

6 files changed

+11
-35
lines changed

6 files changed

+11
-35
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
submodules: 'recursive'
1717

1818
- name: Setup dotnet
19-
uses: actions/setup-dotnet@v3
19+
uses: actions/setup-dotnet@v4
2020
with:
2121
dotnet-version: 8.x
2222
dotnet-quality: ga

OpenVR2WS/JsonOptions.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

OpenVR2WS/MainController.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Diagnostics;
43
using System.Linq;
54
using System.Runtime.Versioning;
@@ -50,7 +49,7 @@ private void InitServer(Action<SuperServer.ServerStatus, int> serverStatus)
5049
var request = new InputMessage();
5150
try
5251
{
53-
request = JsonSerializer.Deserialize<InputMessage>(message, JsonOptions.get());
52+
request = JsonSerializer.Deserialize<InputMessage>(message, JsonOptions.Get());
5453
}
5554
catch (Exception e)
5655
{
@@ -93,7 +92,7 @@ private void SendResult(OutputMessage outputMessage, WebSocketSession? session =
9392
var jsonString = "";
9493
try
9594
{
96-
jsonString = JsonSerializer.Serialize(outputMessage, JsonOptions.get());
95+
jsonString = JsonSerializer.Serialize(outputMessage, JsonOptions.Get());
9796
}
9897
catch (Exception e)
9998
{
@@ -503,7 +502,7 @@ private void SendDeviceProperty(InputMessage inputMessage, WebSocketSession? ses
503502
DataDeviceProperty? data = null;
504503
try
505504
{
506-
data = JsonSerializer.Deserialize<DataDeviceProperty>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.get());
505+
data = JsonSerializer.Deserialize<DataDeviceProperty>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.Get());
507506
}
508507
catch (Exception e)
509508
{
@@ -581,7 +580,7 @@ private void SendSetting(InputMessage inputMessage, WebSocketSession? session =
581580
DataSetting? data = null;
582581
try
583582
{
584-
data = JsonSerializer.Deserialize<DataSetting>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.get());
583+
data = JsonSerializer.Deserialize<DataSetting>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.Get());
585584
}
586585
catch (Exception e)
587586
{
@@ -611,7 +610,7 @@ private void SendRemoteSetting(InputMessage inputMessage, WebSocketSession? sess
611610
DataRemoteSetting? data = null;
612611
try
613612
{
614-
data = JsonSerializer.Deserialize<DataRemoteSetting>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.get());
613+
data = JsonSerializer.Deserialize<DataRemoteSetting>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.Get());
615614
}
616615
catch (Exception e)
617616
{
@@ -633,7 +632,7 @@ private void SendMoveSpace(InputMessage inputMessage, WebSocketSession? session)
633632
DataMoveSpace? data = null;
634633
try
635634
{
636-
data = JsonSerializer.Deserialize<DataMoveSpace>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.get());
635+
data = JsonSerializer.Deserialize<DataMoveSpace>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.Get());
637636
}
638637
catch (Exception e)
639638
{
@@ -673,7 +672,7 @@ private void SendFoundOverlay(InputMessage inputMessage, WebSocketSession? sessi
673672
DataFindOverlay? data = null;
674673
try
675674
{
676-
data = JsonSerializer.Deserialize<DataFindOverlay>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.get());
675+
data = JsonSerializer.Deserialize<DataFindOverlay>(inputMessage.Data?.GetRawText() ?? "", JsonOptions.Get());
677676
}
678677
catch (Exception e)
679678
{

OpenVR2WS/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@
125125
<value>..\resources\Logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126126
</data>
127127
<data name="Version" xml:space="preserve">
128-
<value>v2.8.6</value>
128+
<value>v2.9.0</value>
129129
</data>
130130
</root>

Types/dist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "openvr2ws-types",
3-
"version": "2.8.6",
3+
"version": "2.9.0",
44
"description": "TypeScript type definitions for the input and output of OpenVR2WS.",
55
"type": "module",
66
"types": "types/index.d.ts",

0 commit comments

Comments
 (0)