Skip to content

Commit

Permalink
Update dependencies (#2046)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kryptos-FR authored Jan 11, 2024
1 parent f6d95f4 commit 0f6f4ee
Show file tree
Hide file tree
Showing 55 changed files with 601 additions and 505 deletions.
9 changes: 7 additions & 2 deletions samples/Tests/Stride.Samples.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<IsPackable>true</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageReference Include="xunit" Version="2.6.5" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\sources\shared\SharedAssemblyInfo.cs">
Expand All @@ -29,4 +29,9 @@
</ItemGroup>
<Import Project="..\..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems" Label="Shared" />
<Import Project="..\..\sources\targets\Stride.UnitTests.targets" />
<!-- Override the references set in Stride.UnitTests.targets -->
<ItemGroup>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Update="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
</ItemGroup>
</Project>
118 changes: 47 additions & 71 deletions sources/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<!-- Runtime dependencies -->
<ItemGroup>
<PackageVersion Include="FFmpeg.AutoGen" Version="3.4.0.2" />
<PackageVersion Include="K4os.Compression.LZ4.Legacy" Version="1.2.16" />
<PackageVersion Include="K4os.Compression.LZ4.Legacy" Version="1.3.6" />
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0-preview.4" />
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="6.0.2" />
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="ServiceWire" Version="5.5.4" />
<PackageVersion Include="SharpDX" Version="4.2.0" />
<PackageVersion Include="SharpDX.D3DCompiler" Version="4.2.0" />
Expand All @@ -18,49 +19,47 @@
<PackageVersion Include="SharpDX.MediaFoundation" Version="4.2.0" />
<PackageVersion Include="SharpDX.RawInput" Version="4.2.0" />
<PackageVersion Include="SharpDX.XInput" Version="4.2.0" />
<PackageVersion Include="Silk.NET.OpenGL" Version="2.17.1" />
<PackageVersion Include="Silk.NET.OpenGLES" Version="2.17.1" />
<PackageVersion Include="Silk.NET.OpenGLES.Extensions.EXT" Version="2.17.1" />
<PackageVersion Include="Silk.NET.OpenXR" Version="2.17.1" />
<PackageVersion Include="Silk.NET.Sdl" Version="2.17.1" />
<PackageVersion Include="Silk.NET.Windowing.Sdl" Version="2.17.1" />
<PackageVersion Include="Silk.NET.OpenGL" Version="2.20.0" />
<PackageVersion Include="Silk.NET.OpenGLES" Version="2.20.0" />
<PackageVersion Include="Silk.NET.OpenGLES.Extensions.EXT" Version="2.20.0" />
<PackageVersion Include="Silk.NET.OpenXR" Version="2.20.0" />
<PackageVersion Include="Silk.NET.Sdl" Version="2.20.0" />
<PackageVersion Include="Silk.NET.Windowing.Sdl" Version="2.19.0" />
<PackageVersion Include="Stride.SharpFont" Version="1.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="4.7.2" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.1" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="Vortice.Vulkan" Version="1.2.167" />
</ItemGroup>

<!-- Other dependencies -->
<ItemGroup>
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageVersion Include="Microsoft.Build" Version="17.0.0" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.0.0" />
<PackageVersion Include="Microsoft.Build" Version="17.8.3" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.6.0" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.8.2112" />
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
<PackageVersion Include="Mono.Options" Version="5.3.0.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Mono.Options" Version="6.12.0.148" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NuGet.Commands" Version="6.8.0" />
<PackageVersion Include="NuGet.Configuration" Version="6.8.0" />
<PackageVersion Include="NuGet.PackageManagement" Version="6.8.0" />
<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
<PackageVersion Include="NuGet.Resolver" Version="6.8.0" />
<PackageVersion Include="Silk.NET.Assimp" Version="2.17.1" />
<PackageVersion Include="Silk.NET.Assimp" Version="2.20.0" />
<PackageVersion Include="Stride.GNU.Getopt" Version="2.0.0" />
<PackageVersion Include="Stride.GNU.Gettext" Version="2.0.0" />
<PackageVersion Include="Stride.Mono.TextTemplating" Version="2.1.0-preview-0009-g0d0b6db3ca" />
<PackageVersion Include="SSH.NET" Version="2023.0.0" />
<PackageVersion Include="SSH.NET" Version="2023.0.1" />
<PackageVersion Include="System.AppContext" Version="4.3.0" />
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Console" Version="4.3.1" />
<PackageVersion Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageVersion Include="System.Diagnostics.StackTrace" Version="4.3.0" />
Expand All @@ -69,91 +68,68 @@
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Management" Version="4.7.0" />
<PackageVersion Include="System.Reactive" Version="5.0.0" />
<PackageVersion Include="System.Reactive.Linq" Version="5.0.0" />
<PackageVersion Include="System.Management" Version="8.0.0" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.Reactive.Linq" Version="6.0.0" />
<PackageVersion Include="System.Reflection" Version="4.3.0" />
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="5.0.0" />
<PackageVersion Include="System.Resources.Extensions" Version="4.6.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
<PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
<PackageVersion Include="System.Runtime" Version="4.3.1" />
<PackageVersion Include="System.Runtime.Extensions" Version="4.3.1" />
<PackageVersion Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageVersion Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageVersion Include="System.Security.Cryptography.Encoding" Version="4.3.0" />
<PackageVersion Include="System.Security.Cryptography.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" />
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageVersion Include="System.Threading.Thread" Version="4.3.0" />
<PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
<PackageVersion Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageVersion Include="System.Xml.XPath" Version="4.3.0" />
<PackageVersion Include="System.Xml.XPath.XDocument" Version="4.3.0" />
</ItemGroup>

<!-- Visual Studio dependencies -->
<ItemGroup>
<PackageVersion Include="EnvDTE" Version="17.0.31902.203" />
<PackageVersion Include="EnvDTE80" Version="17.0.31902.203" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging" Version="14.0.23205" />
<PackageVersion Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.14.0" Version="14.0.23205" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Immutable.10.0" Version="10.0.30319" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Immutable.11.0" Version="11.0.50727" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Immutable.12.0" Version="12.0.21003" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Immutable.14.0" Version="14.0.23205" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Interop" Version="7.10.6071" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="8.0.50727" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="9.0.30729" />
<PackageVersion Include="Microsoft.VisualStudio.TextManager.Interop" Version="7.10.6070" />
<PackageVersion Include="Microsoft.VisualStudio.TextManager.Interop.8.0" Version="8.0.50727" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="14.0.51107" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="14.0.23205" />
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="14.0.51103" />
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.0.31902.203" />
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232" />
<PackageVersion Include="stdole" Version="7.0.3301" />
<PackageVersion Include="vslangproj" Version="17.0.31902.203" />
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.7.37357" />
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.7.2196" />
</ItemGroup>

<!-- Test dependencies -->
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="TeamCity.VSTest.TestAdapter" Version="1.0.32" />
<PackageVersion Include="xunit" Version="2.4.2-pre.12" />
<PackageVersion Include="xunit.runner.utility" Version="2.4.2-pre.12" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
<PackageVersion Include="xunit" Version="2.6.5" />
<PackageVersion Include="xunit.runner.utility" Version="2.6.5" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.5-alpha" />
</ItemGroup>

<!-- Avalonia dependencies -->
<ItemGroup>
<PackageVersion Include="Avalonia" Version="0.10.11" />
<PackageVersion Include="Avalonia.Desktop" Version="0.10.11" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.11" />
<PackageVersion Include="Avalonia" Version="11.0.6" />
<PackageVersion Include="Avalonia.Desktop" Version="11.0.6" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.6" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.6" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
</ItemGroup>

<!-- Windows/WPF dependencies -->
<ItemGroup>
<PackageVersion Include="AvalonEdit" Version="6.1.3.50" />
<PackageVersion Include="AvalonEdit" Version="6.3.0.90" />
<PackageVersion Include="Dirkster.AvalonDock" Version="4.72.1" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
<PackageVersion Include="Stride.CrashReport" Version="1.0.2" />
<PackageVersion Include="Stride.GraphX.WPF.Controls" Version="2.4.0" />
<PackageVersion Include="Stride.Metrics" Version="1.0.3" />
<PackageVersion Include="RoslynPad.Editor.Windows" Version="1.2.0" />
<PackageVersion Include="RoslynPad.Roslyn" Version="3.6.0" />
<PackageVersion Include="RoslynPad.Roslyn.Windows" Version="3.6.0" />
</ItemGroup>

<!-- Analyzers -->
<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.0-beta008" PrivateAssets="all" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Stride.Core.Assets.Tests\Helpers\GuidGenerator.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace Stride.Core.Assets.Quantum.Tests
{
using SerializationHelper = Helpers.SerializationHelper;

public class TestAssetCompositeHierarchySerialization
{
const string SimpleHierarchyYaml = @"!MyAssetHierarchy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

namespace Stride.Core.Assets.Quantum.Tests
{
using SerializationHelper = Helpers.SerializationHelper;

public class TestObjectReferenceSerialization
{
private const string SimpleReferenceYaml = @"!Stride.Core.Assets.Quantum.Tests.Helpers.Types+MyAssetWithRef,Stride.Core.Assets.Quantum.Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

namespace Stride.Core.Assets.Quantum.Tests
{
using SerializationHelper = Helpers.SerializationHelper;

public class TestOverrideSerialization
{
/* test TODO:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\core\Stride.Core.Design.Tests\TestMemberPathBase.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<DefineConstants>ASSEMBLY_PROCESSOR;STRIDE_PLATFORM_DESKTOP;TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.7.2" />
<PackageReference Include="xunit" VersionOverride="2.5.1" />
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.5.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<!-- Referenced Packages -->
<ItemGroup>
<PackageReference Include="Mono.Cecil" />
<PackageReference Include="Mono.Options" VersionOverride="6.12.0.148" />
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="17.3.2" ExcludeAssets="runtime" />
<PackageReference Include="Mono.Options" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" />
</ItemGroup>

<!-- Compiled Items -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion sources/core/Stride.Core.Design.Tests/TestFileLock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void TestFilelockWait()
{
// This should never happen. So throw an exception and make sure it is not caught by our catch below.
flag = true;
Assert.True(false, "Cannot create a file lock if parent directory does not exist.");
Assert.Fail("Cannot create a file lock if parent directory does not exist.");
}
}
catch (Exception)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />
Expand Down
5 changes: 4 additions & 1 deletion sources/core/Stride.Core.Tests/Stride.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
Expand Down
Loading

0 comments on commit 0f6f4ee

Please sign in to comment.