Skip to content

Commit

Permalink
Remove ref to deleted file; update submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
zmerp committed Jul 28, 2023
1 parent 5f81c0b commit f6102bf
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 37 deletions.
68 changes: 32 additions & 36 deletions ALVRModule/ALVRModule.csproj
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>ALVRModule</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x64</Platforms>
<BaseOutputPath></BaseOutputPath>
</PropertyGroup>

<ItemGroup>
<None Remove="Assets\alvr.ico" />
<None Remove="Assets\alvr.png" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VRCFaceTracking\VRCFaceTracking.Core\VRCFaceTracking.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Resource Include="Assets\alvr.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>ALVRModule</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x64</Platforms>
<BaseOutputPath></BaseOutputPath>
</PropertyGroup>

<ItemGroup>
<None Remove="Assets\alvr.png" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VRCFaceTracking\VRCFaceTracking.Core\VRCFaceTracking.Core.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Assets\alvr.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetDir)ALVRModule.dll&quot; &quot;%25APPDATA%25\VRCFaceTracking\CustomLibs&quot;" />
</Target>

</Project>
</EmbeddedResource>
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetDir)ALVRModule.dll&quot; &quot;%25APPDATA%25\VRCFaceTracking\CustomLibs&quot;" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion VRCFaceTracking
Submodule VRCFaceTracking updated 30 files
+4 −6 VRCFaceTracking.Core/ConfigParser.cs
+2 −2 VRCFaceTracking.Core/Contracts/Services/ILocalSettingsService.cs
+1 −2 VRCFaceTracking.Core/Contracts/Services/IMainService.cs
+8 −0 VRCFaceTracking.Core/Contracts/Services/IParamSupervisor.cs
+0 −1 VRCFaceTracking.Core/Library/UnifiedLibManager.cs
+5 −18 VRCFaceTracking.Core/MainStandalone.cs
+19 −3 VRCFaceTracking.Core/Models/UnifiedMutationConfig.cs
+47 −7 VRCFaceTracking.Core/OSC/DataTypes/BaseParameter.cs
+11 −3 VRCFaceTracking.Core/OSC/OSCMain.cs
+2 −2 VRCFaceTracking.Core/OSC/OSCMessage.cs
+12 −5 VRCFaceTracking.Core/Params/Data/UnifiedTrackingMutator.cs
+4 −0 VRCFaceTracking.Core/Params/Expressions/UnifiedExpressionsParameters.cs
+2 −6 VRCFaceTracking.Core/VRCFaceTracking.Core.csproj
+4 −1 VRCFaceTracking/App.xaml.cs
+1 −1 VRCFaceTracking/BundleArtifacts/VRCFaceTracking_x64.appinstaller.xml
+4 −2 VRCFaceTracking/MainWindow.xaml.cs
+18 −0 VRCFaceTracking/OpenVR/app.vrmanifest
+8,296 −0 VRCFaceTracking/OpenVR/openvr_api.cs
+ VRCFaceTracking/OpenVR/openvr_api.dll
+1 −1 VRCFaceTracking/Package.appinstaller
+3 −1 VRCFaceTracking/Package.appxmanifest
+1 −1 VRCFaceTracking/Services/ActivationService.cs
+5 −5 VRCFaceTracking/Services/LocalSettingsService.cs
+53 −0 VRCFaceTracking/Services/OpenVRService.cs
+6 −0 VRCFaceTracking/Strings/en/Resources.resw
+8 −1 VRCFaceTracking/VRCFaceTracking.csproj
+3 −7 VRCFaceTracking/ViewModels/RiskySettingsViewModel.cs
+19 −1 VRCFaceTracking/ViewModels/SettingsViewModel.cs
+10 −3 VRCFaceTracking/Views/SettingsPage.xaml
+ fti_osc.dll

0 comments on commit f6102bf

Please sign in to comment.