Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade packages #1331

Merged
merged 2 commits into from
Dec 20, 2024
Merged

upgrade packages #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee431a
upgrade packages
stakira Nov 19, 2024
7c77ccd
fix menus
stakira Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions OpenUtau.Core/OpenUtau.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BunLabs.NAudio.Flac" Version="2.0.1" />
<PackageReference Include="Concentus.OggFile" Version="1.0.4" />
<PackageReference Include="Concentus.OggFile" Version="1.0.6" />
<PackageReference Include="csharp-kana" Version="1.0.1" />
<PackageReference Include="csharp-pinyin" Version="1.0.0" />
<PackageReference Include="Ignore" Version="0.1.50" />
<PackageReference Include="K4os.Hash.xxHash" Version="1.0.8" />
<PackageReference Include="Melanchall.DryWetMidi" Version="7.0.2" />
<PackageReference Include="Melanchall.DryWetMidi" Version="7.2.0" />
<PackageReference Include="NAudio.Core" Version="2.2.1" />
<PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLayer.NAudioSupport" Version="1.4.0" />
<PackageReference Include="NumSharp" Version="0.30.0" />
<PackageReference Include="NWaves" Version="0.9.6" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="SharpCompress" Version="0.36.0" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="System.Buffers" Version="4.6.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="UTF.Unknown" Version="2.5.1" />
<PackageReference Include="Vortice.DXGI" Version="2.4.2" />
<PackageReference Include="WanaKana-net" Version="1.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau.Plugin.Builtin/OpenUtau.Plugin.Builtin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions OpenUtau.Test/OpenUtau.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<SatelliteResourceLanguages>none</SatelliteResourceLanguages>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
28 changes: 14 additions & 14 deletions OpenUtau/OpenUtau.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down Expand Up @@ -53,20 +53,20 @@
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
<PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
<PackageReference Include="NetSparkleUpdater.SparkleUpdater" Version="2.2.3" />
<PackageReference Include="ReactiveUI.Fody" Version="18.3.1" />
<PackageReference Include="Avalonia" Version="11.0.4" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.4" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="Avalonia" Version="11.2.1" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.2.1" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.1" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenUtau.Core\OpenUtau.Core.csproj" />
Expand Down
9 changes: 9 additions & 0 deletions OpenUtau/Styles/Styles.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@
<Setter Property="Height" Value="1" />
</Style>

<Styles>
<Style Selector="MenuItem.MenuItemWithSubMenu MenuItem">
<Setter Property="Header" Value="{Binding Header}"/>
<Setter Property="Command" Value="{Binding Command}"/>
<Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
<Setter Property="Height" Value="{Binding Height}"/>
</Style>
</Styles>

<Style Selector="ContextMenu MenuItem">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="FontSize" Value="12"/>
Expand Down
4 changes: 2 additions & 2 deletions OpenUtau/ViewModels/SingerSetupViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private void RefreshArchiveItems() {
using (var archive = ArchiveFactory.Open(ArchiveFilePath, readerOptions)) {
textItems.Clear();
textItems.AddRange(archive.Entries
.Select(entry => entry.Key)
.Select(entry => entry.Key!)
.ToArray());
}
}
Expand Down Expand Up @@ -127,7 +127,7 @@ private void RefreshTextItems() {
using (var archive = ArchiveFactory.Open(ArchiveFilePath, readerOptions)) {
try {
textItems.Clear();
foreach (var entry in archive.Entries.Where(entry => entry.Key.EndsWith("character.txt") || entry.Key.EndsWith("oto.ini"))) {
foreach (var entry in archive.Entries.Where(entry => entry.Key!.EndsWith("character.txt") || entry.Key.EndsWith("oto.ini"))) {
using (var stream = entry.OpenEntryStream()) {
using var reader = new StreamReader(stream, TextEncoding);
textItems.Add($"------ {entry.Key} ------");
Expand Down
16 changes: 2 additions & 14 deletions OpenUtau/Views/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,11 @@
Opened="OnMainMenuOpened" Closed="OnMainMenuClosed" PointerExited="OnMainMenuPointerLeave">
<MenuItem Header="{DynamicResource menu.file}">
<MenuItem Header="{DynamicResource menu.file.new}" InputGesture="Ctrl+N" Click="OnMenuNew"/>
<MenuItem Header="{DynamicResource menu.file.newfromtemplate}" ItemsSource="{Binding OpenTemplates}">
<MenuItem.DataTemplates>
<DataTemplate DataType="vm:MenuItemViewModel">
<MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
</DataTemplate>
</MenuItem.DataTemplates>
</MenuItem>
<MenuItem Header="{DynamicResource menu.file.newfromtemplate}" ItemsSource="{Binding OpenTemplates}" Classes="MenuItemWithSubMenu"/>
<MenuItem Header="{DynamicResource menu.file.savetemplate}" Click="OnMenuSaveTemplate"/>
<MenuItem Header="-" Height="1"/>
<MenuItem Header="{DynamicResource menu.file.open}" InputGesture="Ctrl+O" Click="OnMenuOpen"/>
<MenuItem Header="{DynamicResource menu.file.openrecent}" ItemsSource="{Binding OpenRecent}">
<MenuItem.DataTemplates>
<DataTemplate DataType="vm:MenuItemViewModel">
<MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
</DataTemplate>
</MenuItem.DataTemplates>
</MenuItem>
<MenuItem Header="{DynamicResource menu.file.openrecent}" ItemsSource="{Binding OpenRecent}" Classes="MenuItemWithSubMenu"/>
<MenuItem Header="{DynamicResource menu.file.openprojectlocation}" Click="OnMenuOpenProjectLocation"/>
<MenuItem Header="-" Height="1"/>
<MenuItem Header="{DynamicResource menu.file.save}" InputGesture="Ctrl+S" Click="OnMenuSave"/>
Expand Down
32 changes: 4 additions & 28 deletions OpenUtau/Views/PianoRollWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,34 +304,10 @@
</MenuItem>

<MenuItem Header="{DynamicResource pianoroll.menu.batch}">
<MenuItem Header="{DynamicResource pianoroll.menu.notes}" ItemsSource="{Binding NoteBatchEdits}">
<MenuItem.DataTemplates>
<DataTemplate DataType="vm:MenuItemViewModel">
<MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
</DataTemplate>
</MenuItem.DataTemplates>
</MenuItem>
<MenuItem Header="{DynamicResource pianoroll.menu.lyrics}" ItemsSource="{Binding LyricBatchEdits}">
<MenuItem.DataTemplates>
<DataTemplate DataType="vm:MenuItemViewModel">
<MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
</DataTemplate>
</MenuItem.DataTemplates>
</MenuItem>
<MenuItem Header="{DynamicResource pianoroll.menu.reset}" ItemsSource="{Binding ResetBatchEdits}">
<MenuItem.DataTemplates>
<DataTemplate DataType="vm:MenuItemViewModel">
<MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
</DataTemplate>
</MenuItem.DataTemplates>
</MenuItem>
<MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu">
<MenuItem.DataTemplates>
<DataTemplate DataType="vm:MenuItemViewModel">
<MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}" Height="{Binding Height}"/>
</DataTemplate>
</MenuItem.DataTemplates>
</MenuItem>
<MenuItem Header="{DynamicResource pianoroll.menu.notes}" ItemsSource="{Binding NoteBatchEdits}" Classes="MenuItemWithSubMenu"/>
<MenuItem Header="{DynamicResource pianoroll.menu.lyrics}" ItemsSource="{Binding LyricBatchEdits}" Classes="MenuItemWithSubMenu"/>
<MenuItem Header="{DynamicResource pianoroll.menu.reset}" ItemsSource="{Binding ResetBatchEdits}" Classes="MenuItemWithSubMenu"/>
<MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu" Classes="MenuItemWithSubMenu"/>
</MenuItem>
<MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" Click="OnMenuEditLyrics"/>
<MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
Expand Down
Loading