Skip to content

Bump Avalonia and 11 others #49

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

Open
dependabot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump Avalonia and 11 others #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"demaconsulting.pandoctool": {
"version": "3.12.0",
"version": "3.12.1",
"commands": [
"pandoc"
]
Expand All @@ -33,7 +33,7 @@
]
},
"demaconsulting.reqstream": {
"version": "1.11.0",
"version": "1.12.0",
"commands": [
"reqstream"
]
Expand Down
4 changes: 2 additions & 2 deletions src/DemaConsulting.Speech.Cli/DemaConsulting.Speech.Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.13" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.4.2" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.4.5" PrivateAssets="All" />
</ItemGroup>

<!-- Code Analysis Dependencies -->
Expand All @@ -83,7 +83,7 @@
<ItemGroup>
<ProjectReference Include="..\DemaConsulting.Speech\DemaConsulting.Speech.csproj" />
<!-- sherpa-onnx ships its own libonnxruntime (1.28.2) with the same file name; copying Microsoft's native runtime too would overwrite it and break sherpa. The managed API is pinned to 1.28.0 so it runs on sherpa's runtime. -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" ExcludeAssets="native" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" ExcludeAssets="native" />
<ProjectReference Include="..\DemaConsulting.Speech.Onnx.ChatterboxTurbo\DemaConsulting.Speech.Onnx.ChatterboxTurbo.csproj" />
<ProjectReference Include="..\DemaConsulting.Speech.Onnx.Kokoro\DemaConsulting.Speech.Onnx.Kokoro.csproj" />
<ProjectReference Include="..\DemaConsulting.Speech.Onnx.NemotronStt\DemaConsulting.Speech.Onnx.NemotronStt.csproj" />
Expand Down
10 changes: 5 additions & 5 deletions src/DemaConsulting.Speech.Demo/DemaConsulting.Speech.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

<!-- Avalonia UI Dependencies -->
<ItemGroup>
<PackageReference Include="Avalonia" Version="12.1.3" />
<PackageReference Include="Avalonia.Desktop" Version="12.1.3" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.3" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.3" />
<PackageReference Include="Avalonia" Version="12.1.4" />
<PackageReference Include="Avalonia.Desktop" Version="12.1.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.4" />
<!-- Diagnostics (the developer-tools overlay) is a development aid only and must never ship
in a Release build, so it is conditioned on the Debug configuration. -->
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.22" Condition="'$(Configuration)' == 'Debug'" />
Expand Down Expand Up @@ -73,7 +73,7 @@
<ItemGroup>
<ProjectReference Include="..\DemaConsulting.Speech\DemaConsulting.Speech.csproj" />
<!-- sherpa-onnx ships its own libonnxruntime (1.28.2) with the same file name; copying Microsoft's native runtime too would overwrite it and break sherpa. The managed API is pinned to 1.28.0 so it runs on sherpa's runtime. -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" ExcludeAssets="native" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" ExcludeAssets="native" />
<ProjectReference Include="..\DemaConsulting.Speech.Onnx.ChatterboxTurbo\DemaConsulting.Speech.Onnx.ChatterboxTurbo.csproj" />
<ProjectReference Include="..\DemaConsulting.Speech.Onnx.Kokoro\DemaConsulting.Speech.Onnx.Kokoro.csproj" />
<ProjectReference Include="..\DemaConsulting.Speech.Onnx.NemotronStt\DemaConsulting.Speech.Onnx.NemotronStt.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ...aConsulting.Speech.Onnx.ChatterboxTurbo/DemaConsulting.Speech.Onnx.ChatterboxTurbo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.13" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.3" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.8" PrivateAssets="All" />
<!-- Managed ONNX Runtime API only; this package runs on the CPU and never references an
accelerated execution-provider package itself. -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" />
</ItemGroup>

<!-- Project References -->
Expand Down
4 changes: 2 additions & 2 deletions src/DemaConsulting.Speech.Onnx.Kokoro/DemaConsulting.Speech.Onnx.Kokoro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.13" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.3" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.8" PrivateAssets="All" />
<!-- Managed ONNX Runtime API only - see the referenced DemaConsulting.Speech.Onnx package's
own remarks for why this package never references an accelerated execution-provider
package itself. -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" />
</ItemGroup>

<!-- Project References -->
Expand Down
4 changes: 2 additions & 2 deletions src/DemaConsulting.Speech.Onnx.NemotronStt/DemaConsulting.Speech.Onnx.NemotronStt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.13" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.3" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.8" PrivateAssets="All" />
<!-- Managed ONNX Runtime API only - see the referenced DemaConsulting.Speech.Onnx package's
own remarks for why this package never references an accelerated execution-provider
package itself. -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" />
</ItemGroup>

<!-- Project References -->
Expand Down
4 changes: 2 additions & 2 deletions src/DemaConsulting.Speech.Onnx/DemaConsulting.Speech.Onnx.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.13" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.3" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.8" PrivateAssets="All" />
<!-- Managed ONNX Runtime API only (CPU execution provider built in). This package does NOT
reference any accelerated execution-provider package (e.g. Microsoft.ML.OnnxRuntime.Gpu/
.DirectML): a consuming application that wants GPU acceleration adds that package itself
Expand All @@ -68,7 +68,7 @@
-available CPU provider when no accelerated provider is present at runtime. This mirrors
the sibling DemaConsulting.Speech.Sherpa package's "consuming application brings its own
native runtime package" convention. -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" />
</ItemGroup>

<!-- Code Analysis Dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion src/DemaConsulting.Speech.Sherpa/DemaConsulting.Speech.Sherpa.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
(CS0121 "ambiguous call") with the identical members already compiled into
DemaConsulting.Speech's own reference assembly. -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.3" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.8" PrivateAssets="All" />
<!-- Managed sherpa-onnx API only. The matching org.k2fsa.sherpa.onnx.runtime.{RID} native
package is deliberately NOT referenced here: this package does NOT bundle sherpa-onnx
native runtime packages; the consuming application adds the runtime package(s) for its
Expand Down
4 changes: 2 additions & 2 deletions src/DemaConsulting.Speech/DemaConsulting.Speech.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
<!-- Build Tool Dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.13" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.4.2" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.4.5" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.3" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.5.8" PrivateAssets="All" />
<PackageReference Include="PortAudioSharp2" Version="1.0.6" />
<!-- Provides System.Numerics.Tensors.TensorPrimitives, used to vectorize the hottest
per-sample audio DSP loops (FIR filtering, volume scaling, PCM sample-format
Expand Down
8 changes: 4 additions & 4 deletions test/DemaConsulting.Speech.Cli.Tests/DemaConsulting.Speech.Cli.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -66,7 +66,7 @@
<!-- Project References -->
<ItemGroup>
<!-- Keep sherpa-onnx's libonnxruntime; Microsoft's native copy would overwrite it (see the Cli project). -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" ExcludeAssets="native" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" ExcludeAssets="native" />
<ProjectReference Include="..\..\src\DemaConsulting.Speech.Cli\DemaConsulting.Speech.Cli.csproj" />
<ProjectReference Include="..\..\src\DemaConsulting.Speech\DemaConsulting.Speech.csproj" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/DemaConsulting.Speech.Demo.Tests/DemaConsulting.Speech.Demo.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down Expand Up @@ -71,7 +71,7 @@
library directly. -->
<ItemGroup>
<!-- Keep sherpa-onnx's libonnxruntime; Microsoft's native copy would overwrite it (see the Cli project). -->
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.28.0" ExcludeAssets="native" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.31.0" ExcludeAssets="native" />
<ProjectReference Include="..\..\src\DemaConsulting.Speech.Demo\DemaConsulting.Speech.Demo.csproj" />
<ProjectReference Include="..\..\src\DemaConsulting.Speech.Sherpa\DemaConsulting.Speech.Sherpa.csproj" />
<!-- Needed only so SpeechDemoTests can compose the catalog exactly as the demo's own
Expand Down
6 changes: 3 additions & 3 deletions test/DemaConsulting.Speech.Onnx.Kokoro.Tests/DemaConsulting.Speech.Onnx.Kokoro.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions ...sulting.Speech.Onnx.NemotronStt.Tests/DemaConsulting.Speech.Onnx.NemotronStt.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions test/DemaConsulting.Speech.Onnx.Tests/DemaConsulting.Speech.Onnx.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions test/DemaConsulting.Speech.Sherpa.Tests/DemaConsulting.Speech.Sherpa.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions test/DemaConsulting.Speech.Tests/DemaConsulting.Speech.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.1" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="WireMock.Net" Version="2.19.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PackageReference Include="xunit.v3" Version="4.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading