Skip to content

Commit b5f5eb8

Browse files
meruunemeruune
committed
NET8.0, Amethyst 1.3
1 parent e1cff2a commit b5f5eb8

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
- name: Prepare WinRT projection files
2929
run: |
3030
nuget restore
31-
msbuild DeviceHandler /restore /p:Platform=x64 /p:PlatformTarget=x64 /p:Configuration=Release /p:RuntimeIdentifier=win10-x64 /t:Rebuild
31+
msbuild DeviceHandler /restore /p:Platform=x64 /p:PlatformTarget=x64 /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /t:Rebuild
3232
3333
- name: Restore and build (publish)
34-
run: msbuild plugin_owoTrackVR /restore /p:Platform=x64 /p:PlatformTarget=x64 /p:Configuration=Release /p:RuntimeIdentifier=win10-x64 /t:Publish /p:PublishProfile=plugin_owoTrackVR\Properties\PublishProfiles\FolderProfile.pubxml
34+
run: msbuild plugin_owoTrackVR /restore /p:Platform=x64 /p:PlatformTarget=x64 /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /t:Publish /p:PublishProfile=plugin_owoTrackVR\Properties\PublishProfiles\FolderProfile.pubxml
3535

3636
- name: Pack published files
3737
run: |
38-
cd plugin_owoTrackVR/bin/Release/net7.0/win10-x64/publish
38+
cd plugin_owoTrackVR/bin/Release/net8.0/win-x64/publish
3939
7z a plugin_owoTrackVR.zip *
4040
4141
- name: Upload plugin artifact
@@ -46,5 +46,5 @@ jobs:
4646
prerelease: true
4747
title: "plugin_owoTrackVR Build Artifact"
4848
files: |
49-
./plugin_owoTrackVR/bin/Release/net7.0/win10-x64/publish/plugin_owoTrackVR.zip
49+
./plugin_owoTrackVR/bin/Release/net8.0/win-x64/publish/plugin_owoTrackVR.zip
5050
./external/manifest.json

‎DeviceHandler/DeviceHandler.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
3+
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
44
<PropertyGroup Label="Globals">
55
<CppWinRTOptimized>true</CppWinRTOptimized>
66
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -151,13 +151,13 @@
151151
</ItemGroup>
152152
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
153153
<ImportGroup Label="ExtensionTargets">
154-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" />
154+
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
155155
</ImportGroup>
156156
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
157157
<PropertyGroup>
158158
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
159159
</PropertyGroup>
160-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props'))" />
161-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets'))" />
160+
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
161+
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
162162
</Target>
163163
</Project>

‎DeviceHandler/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
3+
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
44
</packages>

‎plugin_owoTrackVR/Properties/PublishProfiles/FolderProfile.pubxml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<Configuration>Release</Configuration>
88
<Platform>x64</Platform>
9-
<PublishDir>bin\Release\net7.0\win10-x64\publish\</PublishDir>
9+
<PublishDir>bin\Release\net8.0\win-x64\publish\</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
1111
<_TargetId>Folder</_TargetId>
12-
<TargetFramework>net7.0</TargetFramework>
13-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
12+
<TargetFramework>net8.0</TargetFramework>
13+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1414
<SelfContained>true</SelfContained>
1515
<PublishSingleFile>false</PublishSingleFile>
1616
<PublishReadyToRun>true</PublishReadyToRun>

‎plugin_owoTrackVR/plugin_owoTrackVR.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
55
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
66
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
77
<RootNamespace>plugin_OwoTrack</RootNamespace>
8-
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
8+
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
99
<PublishTrimmed>true</PublishTrimmed>
1010
<Platforms>x64</Platforms>
1111
<Platform>x64</Platform>
@@ -18,12 +18,12 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Amethyst.Plugins.Contract" Version="0.3.35" />
22-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.8" />
23-
<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
24-
<PackageReference Include="System.ComponentModel.Composition.Registration" Version="8.0.0" />
25-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
26-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
21+
<PackageReference Include="Amethyst.Plugins.Contract" Version="1.3.0" />
22+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
23+
<PackageReference Include="System.ComponentModel.Composition" Version="9.0.6" />
24+
<PackageReference Include="System.ComponentModel.Composition.Registration" Version="9.0.6" />
25+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
26+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

0 commit comments

Comments
 (0)