Updated for managed release

Author: meruune

external/manifest.json

@@ -1,7 +1,17 @@
 {
-  "version": "1.0.0.2",
-  "display_name": "SteamVR",
-  "download_": "plugin_OpenVR.zip",
-  "changelog": "Better path handling for SteamVR",
-  "guid": "K2VRTEAM-AME2-APII-SNDP-SENDPTOPENVR"
-}
+  "name": "SteamVR",
+  "description": "Ame2 plugin for SteamVR, including support for OpenVR-compatible devices.",
+  "guid": "K2VRTEAM-AME2-APII-SNDP-SENDPTOPENVR",
+  "type": "service",
+  "author": "K2VR Team",
+  "artifacts": [
+    {
+      "version": "2.0.0.0",
+      "contract": "2.0.0.0",
+      "platform": "any",
+      "name": "SteamVR",
+      "download": "plugin_OpenVR.zip",
+      "changelog": "Initial release of the OpenVR plugin."
+    }
+  ]
+}

plugin_OpenVR/OpenVR.cs

@@ -29,7 +29,7 @@ namespace plugin_OpenVR;
 [ExportMetadata("Name", "SteamVR")]
 [ExportMetadata("Guid", "K2VRTEAM-AME2-APII-SNDP-SENDPTOPENVR")]
 [ExportMetadata("Publisher", "K2VR Team")]
-[ExportMetadata("Version", "1.0.0.2")]
+[ExportMetadata("Version", "2.0.0.0")]
 [ExportMetadata("Website", "https://github.com/KinectToVR/plugin_OpenVR")]
 [ExportMetadata("DependencyInstaller", typeof(DriverInstaller))]
 [ExportMetadata("CoreSetupData", typeof(SetupData))]

plugin_OpenVR/Utils/VRHelper.cs

@@ -17,14 +17,8 @@ public class VrHelper
 {
     private readonly IVrHelperPlatform _impl = s_staticImpl.Value;
 
-    private static readonly Lazy<IVrHelperPlatform> s_staticImpl = new(() =>
-    {
-#if WINDOWS
-        return new VrHelperWindows();
-#else
-        return new VrHelperLinux();
-#endif
-    });
+    private static readonly Lazy<IVrHelperPlatform> s_staticImpl =
+        new(() => OperatingSystem.IsWindows() ? new VrHelperWindows() : new VrHelperLinux());
 
     public ((bool SteamExists, bool VrSettingsExist, bool CopiedDriverExists) Exists,
         (string SteamVrPath, string VrSettingsPath, string CopiedDriverPath) Path)

plugin_OpenVR/Utils/VRPaths.cs

@@ -10,16 +10,12 @@ namespace plugin_OpenVR.Utils;
 [SuppressMessage("ReSharper", "CollectionNeverUpdated.Global")]
 internal class OpenVrPaths
 {
-#if WINDOWS
-    public static readonly string Path =
+    public static string Path => OperatingSystem.IsWindows() ?
         Environment.ExpandEnvironmentVariables(System.IO.Path.Combine(
-            "%LocalAppData%", "openvr", "openvrpaths.vrpath"));
-#else
-    public static readonly string Path =
+            "%LocalAppData%", "openvr", "openvrpaths.vrpath")) :
         System.IO.Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
             ".config", "openvr", "openvrpaths.vrpath");
-#endif
 
     public static OpenVrPaths Read()
     {
@@ -60,11 +56,13 @@ public void Write()
 #pragma warning restore 0649
 }
 
-#if WINDOWS
 public static class PathUtils
 {
-    public static string GetShortName(string sLongFileName)
+    private static string GetShortName(string sLongFileName)
     {
+        if (!OperatingSystem.IsWindows())
+            return sLongFileName;
+
         var buffer = new StringBuilder(259);
         if (GetShortPathName(sLongFileName, buffer, buffer.Capacity) == 0)
             throw new System.ComponentModel.Win32Exception();
@@ -79,6 +77,9 @@ public static string ShortPath(this string path)
     {
         try
         {
+            if (!OperatingSystem.IsWindows())
+                return path;
+
             var result = GetShortName(path);
             return string.IsNullOrEmpty(result) ? path : result;
         }
@@ -88,17 +89,3 @@ public static string ShortPath(this string path)
         }
     }
 }
-#else
-public static class PathUtils
-{
-    public static string GetShortName(string sLongFileName)
-    {
-        return sLongFileName;
-    }
-
-    public static string ShortPath(this string path)
-    {
-        return path;
-    }
-}
-#endif

plugin_OpenVR/Utils/VrHelper.Windows.cs

@@ -3,13 +3,14 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Security.Principal;
 using System.Threading;
 using Microsoft.Win32;
 
 namespace plugin_OpenVR.Utils;
 
-#if WINDOWS
+[SupportedOSPlatform("windows")]
 internal class VrHelperWindows : IVrHelperPlatform
 {
     public ((bool SteamExists, bool VrSettingsExist, bool CopiedDriverExists) Exists,
@@ -175,4 +176,3 @@ private enum ProcessAccessFlags : uint
         QueryLimitedInformation = 0x00001000
     }
 }
-#endif

plugin_OpenVR/plugin_OpenVR.csproj

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>plugin_OpenVR</RootNamespace>
-    <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     <PublishTrimmed>false</PublishTrimmed>
     <Platforms>x64</Platforms>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -12,13 +11,6 @@
     <WarningsAsErrors>CA1416</WarningsAsErrors>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='win-x86'">
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
-    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <TrimmerRootAssembly Include="MessagePack"/>
     <TrimmerRootAssembly Include="Microsoft.VisualStudio.Threading"/>
@@ -86,26 +78,12 @@
 
   <ItemGroup>
     <!-- Windows x64 -->
-    <Content Include="..\vendor\openvr\bin\win64\openvr_api.dll" Link="openvr_api.dll"
-             Condition="'$(RuntimeIdentifier)'=='win-x64'">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-
-    <!-- Windows x86 -->
-    <Content Include="..\vendor\openvr\bin\win32\openvr_api.dll" Link="openvr_api.dll"
-             Condition="'$(RuntimeIdentifier)'=='win-x86'">
+    <Content Include="..\vendor\openvr\bin\win64\openvr_api.dll" Link="openvr_api.dll" Visible="False">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
 
     <!-- Linux x64 -->
-    <Content Include="..\vendor\openvr\bin\linux64\libopenvr_api.so" Link="libopenvr_api.so"
-             Condition="'$(RuntimeIdentifier)'=='linux-x64'">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-
-    <!-- Linux x86 -->
-    <Content Include="..\vendor\openvr\bin\linux32\libopenvr_api.so" Link="libopenvr_api.so"
-             Condition="'$(RuntimeIdentifier)'=='linux-x86'">
+    <Content Include="..\vendor\openvr\bin\linux64\libopenvr_api.so" Link="libopenvr_api.so" Visible="False">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>