NET8.0, Amethyst 1.3

Author: meruune

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
         uses: microsoft/[email protected]
 
       - name: Restore and build (publish)
-        run: msbuild plugin_KinectOne /restore /p:Platform=x64 /p:PlatformTarget=x64 /p:Configuration=Release /p:RuntimeIdentifier=win10-x64 /t:Publish /p:PublishProfile=plugin_KinectOne\Properties\PublishProfiles\FolderProfile.pubxml
+        run: msbuild plugin_KinectOne /restore /p:Platform=x64 /p:PlatformTarget=x64 /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /t:Publish /p:PublishProfile=plugin_KinectOne\Properties\PublishProfiles\FolderProfile.pubxml
 
       - name: Pack published files
         run: |

KinectHandler/KinectHandler.vcxproj

@@ -17,8 +17,8 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>KinectHandler</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -95,13 +95,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Amethyst.Plugins.Contract">
-      <Version>0.3.35</Version>
+      <Version>1.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel">
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Composition">
-      <Version>8.0.0</Version>
+      <Version>9.0.6</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

plugin_KinectOne/Properties/PublishProfiles/FolderProfile.pubxml

@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\Release\Publish</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
     <PublishReadyToRun>true</PublishReadyToRun>

plugin_KinectOne/RuntimeInstaller.cs

@@ -228,21 +228,6 @@ public static bool KinectV2MicrophoneDisabled()
     }
 }
 
-public static class RestExtensions
-{
-    public static Task<byte[]> ExecuteDownloadDataAsync(this RestClient client, string baseUrl, RestRequest request)
-    {
-        client.Options.BaseUrl = new Uri(baseUrl);
-        return client.DownloadDataAsync(request);
-    }
-
-    public static Task<Stream> ExecuteDownloadStreamAsync(this RestClient client, string baseUrl, RestRequest request)
-    {
-        client.Options.BaseUrl = new Uri(baseUrl);
-        return client.DownloadStreamAsync(request);
-    }
-}
-
 public static class StreamExtensions
 {
     public static async Task CopyToWithProgressAsync(this Stream source,

plugin_KinectOne/plugin_KinectOne.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 		<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
 		<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
 		<RootNamespace>plugin_KinectOne</RootNamespace>
-		<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+		<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
 		<Platforms>x64</Platforms>
 		<UseWinUI>true</UseWinUI>
 		<LangVersion>latest</LangVersion>
@@ -16,13 +16,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Amethyst.Plugins.Contract" Version="0.3.35" />
+		<PackageReference Include="Amethyst.Plugins.Contract" Version="1.3.0" />
 		<PackageReference Include="NAudio.Sdl2" Version="2.2.6" />
-		<PackageReference Include="RestSharp" Version="108.0.3" />
-		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
-		<PackageReference Include="System.ComponentModel.Composition.Registration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+		<PackageReference Include="RestSharp" Version="112.1.0" />
+		<PackageReference Include="System.ComponentModel.Composition" Version="9.0.6" />
+		<PackageReference Include="System.ComponentModel.Composition.Registration" Version="9.0.6" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
 	</ItemGroup>
 
 	<ItemGroup>