Skip to content

Commit 5d20af3

Browse files
committed
Fixed stupid ASP.NET
1 parent b5b26e2 commit 5d20af3

File tree

5 files changed

+33
-14
lines changed

5 files changed

+33
-14
lines changed

external/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "1.0.0.4",
2+
"version": "1.0.0.5",
33
"display_name": "Amethyst Tracking Relay",
44
"download_": "plugin_Relay.zip",
5-
"changelog": "New transport layer.",
5+
"changelog": "Fixed deps-related crashes.",
66
"guid": "K2VRTEAM-AME2-APII-DVCE-TRACKINGRELAY"
77
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
3+
<Project>
4+
<PropertyGroup>
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
<PublishDir>bin\x64\Debug\net8.0\publish\win-x64\</PublishDir>
8+
<PublishProtocol>FileSystem</PublishProtocol>
9+
<_TargetId>Folder</_TargetId>
10+
<TargetFramework>net8.0</TargetFramework>
11+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
12+
<SelfContained>true</SelfContained>
13+
<PublishSingleFile>false</PublishSingleFile>
14+
<PublishReadyToRun>false</PublishReadyToRun>
15+
<PublishTrimmed>false</PublishTrimmed>
16+
</PropertyGroup>
17+
</Project>
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
2-
"profiles": {
3-
"plugin_OpenVR": {
4-
"commandName": "Project"
5-
}
6-
}
2+
"profiles": {
3+
"Amethyst": {
4+
"commandName": "Executable",
5+
"executablePath": ".\\Amethyst.exe",
6+
"workingDirectory": "..\\..\\..\\Amethyst\\Amethyst\\bin\\x64\\Debug\\net8.0\\win-x64\\"
7+
}
8+
}
79
}

plugin_Relay/RelayService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel.Composition;
44
using System.Linq;
@@ -369,8 +369,8 @@ public void Shutdown()
369369

370370
public async Task<(int Status, string StatusMessage, long PingTime)> TestConnection()
371371
{
372-
return (ServerTask.Status is TaskStatus.Running ? 0 : 1,
373-
ServerTask.Status is TaskStatus.Running ? "OK" : $"Server status is {ServerTask.Status}", 0L);
372+
return (ServerTask?.Status is TaskStatus.Running ? 0 : 1,
373+
ServerTask?.Status is TaskStatus.Running ? "OK" : $"Server status is {ServerTask?.Status ?? TaskStatus.Canceled}", 0L);
374374
}
375375

376376
public Task<IEnumerable<(TrackerBase Tracker, bool Success)>> SetTrackerStates(

plugin_Relay/plugin_Relay.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<ItemGroup>
2727
<PackageReference Include="Amethyst.Plugins.Contract" Version="1.3.0" />
2828
<PackageReference Include="MemoryPack" Version="1.21.4" />
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
30+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
3131
<PackageReference Include="Stl.Generators" Version="6.8.11" />
3232
<PackageReference Include="Stl.Rpc" Version="6.8.11" />
3333
<PackageReference Include="Stl.Rpc.Server" Version="6.8.11" />
34-
<PackageReference Include="System.ComponentModel.Composition" Version="9.0.6" />
35-
<PackageReference Include="System.ComponentModel.Composition.Registration" Version="9.0.6" />
34+
<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
35+
<PackageReference Include="System.ComponentModel.Composition.Registration" Version="8.0.0" />
3636
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
3737
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
3838
</ItemGroup>

0 commit comments

Comments
 (0)