Skip to content

Commit da4a8b8

Browse files
committed
example関係からpreviewの状態を排除
1 parent 40a2a5d commit da4a8b8

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

examples/MAUI/MAUI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
<AndroidNativeLibrary Include="voicevox_core/android/voicevox_onnxruntime-android-x64-1.17.3/lib/libvoicevox_onnxruntime.so">
9797
<Abi>x86_64</Abi>
9898
</AndroidNativeLibrary>
99-
<AndroidNativeLibrary Include="voicevox_core/android/voicevox_core-android-arm64-0.16.0-preview.1/lib/libvoicevox_core.so">
99+
<AndroidNativeLibrary Include="voicevox_core/android/voicevox_core-android-arm64-0.16.0/lib/libvoicevox_core.so">
100100
<Abi>arm64-v8a</Abi>
101101
</AndroidNativeLibrary>
102-
<AndroidNativeLibrary Include="voicevox_core/android/voicevox_core-android-x86_64-0.16.0-preview.1/lib/libvoicevox_core.so">
102+
<AndroidNativeLibrary Include="voicevox_core/android/voicevox_core-android-x86_64-0.16.0/lib/libvoicevox_core.so">
103103
<Abi>x86_64</Abi>
104104
</AndroidNativeLibrary>
105105
<AndroidNativeLibrary Include="$(ANDROID_NDK_SYSROOT)/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so">

examples/MAUI/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MAUI Sample
22

3-
voicevox_core 0.16.0-preview.1 を使用した MAUI サンプルです。
3+
voicevox_core 0.16.0 を使用した MAUI サンプルです。
44

55
## Usage
66

@@ -20,14 +20,14 @@ $ download-osx-arm64 --only models dict -o ./examples/MAUI/voicevox_core
2020
#### macOS
2121

2222
```sh
23-
$ download-osx-arm64 --c-api-version 0.16.0-preview.1 --onnxruntime-version voicevox_onnxruntime-1.17.3 -o ./examples/MAUI/voicevox_core
23+
$ download-osx-arm64 --c-api-version 0.16.0 --onnxruntime-version voicevox_onnxruntime-1.17.3 -o ./examples/MAUI/voicevox_core
2424
```
2525

2626
#### Android / iOS
2727

2828
Download `voicevox_core` and `onnxruntime` from the following URL.
2929

30-
- https://github.com/VOICEVOX/voicevox_core/releases/tag/0.16.0-preview.1
30+
- https://github.com/VOICEVOX/voicevox_core/releases/tag/0.16.0
3131
- https://github.com/VOICEVOX/onnxruntime-builder/releases/tag/voicevox_onnxruntime-1.17.3
3232

3333
and extract them to `./examples/MAUI/voicevox_core`.

examples/cli/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ https://github.com/VOICEVOX/voicevox_core/tree/main/example/cpp/unix を参考
1212

1313
```sh
1414
# macOS Arm64の場合
15-
$ ./download-osx-arm64 --version 0.15.0-preview.15
15+
$ ./download-osx-arm64 --c-api-version 0.16.0 --onnxruntime-version voicevox_onnxruntime-1.17.3 -o voicevox_core
1616
```
1717

18-
2024/09/28 現在 main ブランチのみをサポートしています。
19-
そのため上記の Downloader を用いた製品版の利用はできません。
20-
互換のあるバージョンは [こちら](../../src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props)`VoicevoxCoreCommitHash` に記載されているコミットハッシュを参照してください。
18+
このリポジトリは voicevox_core の main ブランチに追従しているため、examples/cli のコードが動作しない場合もあります。
19+
動作しない場合、Release タグが打たれているバージョンに switch して実行してください。
20+
21+
トラッキングしている main のバージョンは[こちら](../../src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props)`VoicevoxCoreCommitHash` に記載されているコミットハッシュを参照してください。
2122

2223
ダウンロードが完了すると `voicevox_core` ディレクトリに必要なファイルが配置されます。
2324

examples/cli/cli.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
see: https://learn.microsoft.com/en-us/dotnet/core/compatibility/deployment/8.0/rid-asset-list
7777
-->
7878
<ItemGroup Label="Copy libvoicevox_core">
79-
<Content Include="$(CoreBasePath)\libvoicevox_core.dylib" TargetPath="libvoicevox_core.dylib" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('OSX'))" />
80-
<Content Include="$(CoreBasePath)\libvoicevox_core.so" TargetPath="libvoicevox_core.so" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Linux'))" />
81-
<Content Include="$(CoreBasePath)\voicevox_core.dll" TargetPath="voicevox_core.dll" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
79+
<Content Include="$(CoreBasePath)\c_api\lib\libvoicevox_core.dylib" TargetPath="libvoicevox_core.dylib" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('OSX'))" />
80+
<Content Include="$(CoreBasePath)\c_api\lib\libvoicevox_core.so" TargetPath="libvoicevox_core.so" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Linux'))" />
81+
<Content Include="$(CoreBasePath)\c_api\lib\voicevox_core.dll" TargetPath="voicevox_core.dll" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
8282
</ItemGroup>
8383
<ItemGroup Label="Copy own libonnxruntime" Condition="$(UseNugetOnnxRuntime) != 'true'">
84-
<Content Include="$(CoreBasePath)\libonnxruntime.$(VoicevoxOnnxRuntimeVersion).dylib" TargetPath="libonnxruntime.$(VoicevoxOnnxRuntimeVersion).dylib" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('OSX'))" />
85-
<Content Include="$(CoreBasePath)\libonnxruntime.so.$(VoicevoxOnnxRuntimeVersion)" TargetPath="libonnxruntime.so.$(VoicevoxOnnxRuntimeVersion)" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Linux'))" />
86-
<Content Include="$(CoreBasePath)\onnxruntime.$(VoicevoxOnnxRuntimeVersion).dll" TargetPath="onnxruntime.$(VoicevoxOnnxRuntimeVersion).dll" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
84+
<Content Include="$(CoreBasePath)\onnxruntime\lib\libvoicevox_onnxruntime.$(VoicevoxOnnxRuntimeVersion).dylib" TargetPath="libvoicevox_onnxruntime.$(VoicevoxOnnxRuntimeVersion).dylib" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('OSX'))" />
85+
<Content Include="$(CoreBasePath)\onnxruntime\lib\libonnxruntime.so.$(VoicevoxOnnxRuntimeVersion)" TargetPath="libvoicevox_onnxruntime.so.$(VoicevoxOnnxRuntimeVersion)" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Linux'))" />
86+
<Content Include="$(CoreBasePath)\onnxruntime\lib\onnxruntime.$(VoicevoxOnnxRuntimeVersion).dll" TargetPath="voicevox_onnxruntime.$(VoicevoxOnnxRuntimeVersion).dll" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
8787
</ItemGroup>
8888
<ItemGroup Label="Copy Nuget provided libonnxruntime" Condition="$(UseNugetOnnxRuntime) == 'true'">
8989
<Content Include="$(OutputPath)runtimes\$(_MyRuntimeIdentifier)\native\libonnxruntime.dylib" TargetPath="libonnxruntime.$(VoicevoxOnnxRuntimeVersion).dylib" Visible="false" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOsPlatform('OSX'))" />

0 commit comments

Comments
 (0)