stride3d
/
stride
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Build] Fix latest nuget and update packages

This commit is contained in:
Eideren 2022-01-13 19:28:00 +01:00
Родитель cd5291feda
Коммит 23644db1c1
46 изменённых файлов: 152 добавлений и 246 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

68
build/compile.bat
Просмотреть файл

@ -8,6 +8,7 @@ set __BuildType=Debug
set __BuildVerbosity=m
set __BuildDoc=0
set __ContinueOnError=false
set __SelectedProject=Stride.sln
:Arg_Loop
rem This does not check for duplicate arguments, the last one will take precedence
@ -70,68 +71,6 @@ call :compile
set __SkipTestBuild=%__OldSkipTestBuild%
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Direct3D.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Direct3D.SDL.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Direct3D.CoreCLR.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Direct3D12.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Null.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Vulkan.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Vulkan.SDL.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.OpenGL.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.OpenGL.CoreCLR.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Linux.sln
set _platform_target=Linux
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Linux.Vulkan.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Linux.CoreCLR.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Linux.Vulkan.CoreCLR.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.macOS.sln
set _platform_target=macOS
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.macOS.CoreCLR.sln
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.Android.sln
set _platform_target=Android
call :compile
@ -142,11 +81,6 @@ set _platform_target=iPhone
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
set Project=Stride.UWP.sln
set _platform_target=UWP
call :compile
if %ERRORLEVEL% NEQ 0 if "%__ContinueOnError%" == "false" goto exit
goto exit
rem Compile our solution. The following variables needs to be set:

4
samples/Tests/Stride.Samples.Tests.csproj
Просмотреть файл

@ -10,8 +10,8 @@
<IsPackable>true</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\sources\shared\AttachedChildProcessJob.cs" Link="AttachedChildProcessJob.cs" />

4
sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj
Просмотреть файл

@ -6,8 +6,8 @@
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Stride.Core.Assets.Tests\Helpers\GuidGenerator.cs">

4
sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
Просмотреть файл

@ -13,8 +13,8 @@
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />

4
sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj
Просмотреть файл

@ -10,8 +10,8 @@
<StartupObject>xunit.runner.stride.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\core\Stride.Core.Design.Tests\TestMemberPathBase.cs">

20
sources/assets/Stride.Core.Assets/PackageSession.Dependencies.cs
Просмотреть файл

@ -396,26 +396,6 @@ namespace Stride.Core.Assets
}
}
private static RemoteWalkContext CreateRemoteWalkContext(RestoreRequest request, RestoreCollectorLogger logger)
{
var context = new RemoteWalkContext(
request.CacheContext,
request.PackageNameSpaces,
logger);
foreach (var provider in request.DependencyProviders.LocalProviders)
{
context.LocalLibraryProviders.Add(provider);
}
foreach (var provider in request.DependencyProviders.RemoteProviders)
{
context.RemoteLibraryProviders.Add(provider);
}
return context;
}
private static ExternalProjectReference ToExternalProjectReference(PackageSpec project)
{
return new ExternalProjectReference(

4
sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj
Просмотреть файл

@ -11,9 +11,9 @@
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />
</ItemGroup>

8
sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj
Просмотреть файл

@ -7,10 +7,10 @@
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NuGet.Protocol" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.PackageManagement" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Resolver" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Commands" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Protocol" Version="6.0.0" />
<PackageReference Include="NuGet.PackageManagement" Version="6.0.0" />
<PackageReference Include="NuGet.Resolver" Version="6.0.0" />
<PackageReference Include="NuGet.Commands" Version="6.0.0" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
</ItemGroup>
<ItemGroup>

4
sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj
Просмотреть файл

@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>

4
sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj
Просмотреть файл

@ -8,8 +8,8 @@
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />

4
sources/core/Stride.Core.Design/Stride.Core.Design.csproj
Просмотреть файл

@ -27,9 +27,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
<!-- <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> -->
<PackageReference Include="NuGet.Configuration" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Configuration" Version="6.0.0" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="System.Management" Version="4.7.0" />
</ItemGroup>

4
sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj
Просмотреть файл

@ -11,8 +11,8 @@
<OutputPath>..\..\..\Bin\Tests\$(AssemblyName)\$(StridePlatform)</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />

4
sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj
Просмотреть файл

@ -20,9 +20,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\deps\libgit2\LibGit2Sharp.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e">
<EmbedInteropTypes>True</EmbedInteropTypes>
</PackageReference>

4
sources/core/Stride.Core.Tests/Stride.Core.Tests.csproj
Просмотреть файл

@ -8,8 +8,8 @@
<StrideBuildTags>Windows;Android;iOS</StrideBuildTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">

4
sources/core/Stride.Core.Yaml.Tests/Stride.Core.Yaml.Tests.csproj
Просмотреть файл

@ -8,8 +8,8 @@
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="files\*.yaml" />

2
sources/core/Stride.Core/Stride.Core.csproj
Просмотреть файл

@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="ServiceWire" Version="5.3.4" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.2.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

14
sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
Просмотреть файл

@ -114,7 +114,6 @@ namespace Stride.Assets.Presentation.AssetEditors.ScriptEditor
// Context Actions
contextActionsRenderer.Providers.Remove(contextActionProvider);
contextActionsRenderer.Dispose();
contextActionsRenderer = null;
contextActionProvider = null;
@ -131,13 +130,13 @@ namespace Stride.Assets.Presentation.AssetEditors.ScriptEditor
public void ProcessDiagnostics(DiagnosticsUpdatedArgs args)
{
if (this.GetDispatcher().CheckAccess())
if (this.Dispatcher.CheckAccess())
{
ProcessDiagnosticsOnUiThread(args);
return;
}
this.GetDispatcher().InvokeAsync(() => ProcessDiagnosticsOnUiThread(args));
this.Dispatcher.InvokeAsync(() => ProcessDiagnosticsOnUiThread(args));
}
private void ProcessDiagnosticsOnUiThread(DiagnosticsUpdatedArgs args)
@ -156,7 +155,12 @@ namespace Stride.Assets.Presentation.AssetEditors.ScriptEditor
continue;
}
var marker = textMarkerService.TryCreate(diagnosticData.TextSpan.Start, diagnosticData.TextSpan.Length);
if (diagnosticData.GetTextSpan() is Microsoft.CodeAnalysis.Text.TextSpan diag == false)
{
continue;
}
var marker = textMarkerService.TryCreate(diag.Start, diag.Length);
if (marker != null)
{
marker.Tag = args.Id;
@ -194,7 +198,7 @@ namespace Stride.Assets.Presentation.AssetEditors.ScriptEditor
{
base.OnKeyDown(e);
if (e.HasModifiers(ModifierKeys.Control))
if ((Keyboard.Modifiers & ModifierKeys.Control) != 0)
{
switch (e.Key)
{

20
sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
Просмотреть файл

@ -15,21 +15,15 @@
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="AvalonEdit" Version="6.0.0" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="AvalonEdit" Version="6.1.3.50" />
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
<Reference Include="RoslynPad.Editor.Windows">
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\netcoreapp3.1\RoslynPad.Editor.Windows.dll</HintPath>
</Reference>
<Reference Include="RoslynPad.Roslyn.Windows">
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\netcoreapp3.1\RoslynPad.Roslyn.Windows.dll</HintPath>
</Reference>
<Reference Include="RoslynPad.Roslyn">
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\netcoreapp3.1\RoslynPad.Roslyn.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.6.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.6.0" />
<PackageReference Include="RoslynPad.Editor.Windows" Version="1.2.0" />
<PackageReference Include="RoslynPad.Roslyn.Windows" Version="3.6.0" />
<PackageReference Include="RoslynPad.Roslyn" Version="3.6.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">

4
sources/editor/Stride.Core.Assets.Editor.Tests/Stride.Core.Assets.Editor.Tests.csproj
Просмотреть файл

@ -6,8 +6,8 @@
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />

2
sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj
Просмотреть файл

@ -10,7 +10,7 @@
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dirkster.AvalonDock" Version="4.10.0" />
<PackageReference Include="Dirkster.AvalonDock" Version="4.60.1" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Management" Version="4.7.0" />

4
sources/editor/Stride.Editor/Stride.Editor.csproj
Просмотреть файл

@ -12,8 +12,8 @@
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />

4
sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj
Просмотреть файл

@ -6,8 +6,8 @@
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\assets\Stride.Core.Assets.Tests\Helpers\GuidGenerator.cs">

4
sources/engine/Stride.Assets.Tests/Stride.Assets.Tests.csproj
Просмотреть файл

@ -11,8 +11,8 @@
<ProjectReference Include="..\Stride.Assets.Models\Stride.Assets.Models.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\assets\Stride.Core.Assets.Tests\Helpers\GuidGenerator.cs">

8
sources/engine/Stride.Assets.Tests2/Stride.Assets.Tests2.csproj
Просмотреть файл

@ -10,10 +10,10 @@
<AssemblyName>Stride.Assets.Tests2</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.23" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.32" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />

10
sources/engine/Stride.Assets/Stride.Assets.csproj
Просмотреть файл

@ -13,13 +13,13 @@
<DefineConstants>STRIDE_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
<!--PackageReference Include="Esent.Interop" Version="1.9.4" /-->
<PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.6.0" />
<PackageReference Include="SSH.NET" Version="2016.1.0" />
<PackageReference Include="System.AppContext" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
@ -31,7 +31,7 @@
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.7.0" />
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />

6
sources/engine/Stride.Graphics.Regression/Stride.Graphics.Regression.csproj
Просмотреть файл

@ -21,9 +21,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<ProjectReference Include="..\..\tools\Stride.Graphics.RenderDocPlugin\Stride.Graphics.RenderDocPlugin.csproj" Condition="$(TargetFramework.StartsWith('net'))" />
<ProjectReference Include="..\Stride.Engine\Stride.Engine.csproj" />
</ItemGroup>

12
sources/engine/Stride.Physics.Tests/CharacterTest.cs
Просмотреть файл

@ -90,9 +90,9 @@ namespace Stride.Physics.Tests
Assert.NotEqual(currentPos, character.Transform.Position);
var target = currentPos + Vector3.UnitX*3*simulation.FixedTimeStep;
Assert.Equal(character.Transform.Position.X, target.X, 15);
Assert.Equal(character.Transform.Position.Y, target.Y, 15);
Assert.Equal(character.Transform.Position.Z, target.Z, 15);
Assert.Equal(character.Transform.Position.X, target.X, 15f);
Assert.Equal(character.Transform.Position.Y, target.Y, 15f);
Assert.Equal(character.Transform.Position.Z, target.Z, 15f);
currentPos = character.Transform.Position;
@ -100,9 +100,9 @@ namespace Stride.Physics.Tests
Assert.NotEqual(currentPos, character.Transform.Position);
target = currentPos + Vector3.UnitX * 3 * simulation.FixedTimeStep;
Assert.Equal(character.Transform.Position.X, target.X, 15);
Assert.Equal(character.Transform.Position.Y, target.Y, 15);
Assert.Equal(character.Transform.Position.Z, target.Z, 15);
Assert.Equal(character.Transform.Position.X, target.X, 15f);
Assert.Equal(character.Transform.Position.Y, target.Y, 15f);
Assert.Equal(character.Transform.Position.Z, target.Z, 15f);
controller.SetVelocity(Vector3.Zero);

80
sources/engine/Stride.Physics.Tests/ColliderShapesTest.cs
Просмотреть файл

@ -93,29 +93,29 @@ namespace Stride.Physics.Tests
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, 0.5f, 0.0f), cylinder.Transform.Position + new Vector3(0.0f, 0.5f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0, 0.9991773f, -0.04055634f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(2.17587972f, 0.5f, -7.46081161f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, 0.9991773f, -0.04055634f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(2.17587972f, 0.5f, -7.46081161f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.55f, 0.0f), cylinder.Transform.Position + new Vector3(0.0f, -0.55f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.5f, 0.0f), cylinder.Transform.Position + new Vector3(0.0f, -0.5f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0, -0.9999594f, -0.00901306048f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(2.17587972f, -0.5f, -7.460182f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, -0.9999594f, -0.00901306048f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(2.17587972f, -0.5f, -7.460182f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.55f, 0.0f, 0.0f), cylinder.Transform.Position + new Vector3(0.55f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.5f, 0.0f, 0.0f), cylinder.Transform.Position + new Vector3(0.5f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0.984618843f, -0.00194456265f, -0.174706012f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(2.67587972f, 0, -7.049136f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0.984618843f, -0.00194456265f, -0.174706012f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(2.67587972f, 0, -7.049136f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.55f, 0.0f, 0.0f), cylinder.Transform.Position + new Vector3(-0.55f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cylinder.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.5f, 0.0f, 0.0f), cylinder.Transform.Position + new Vector3(-0.5f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(-0.984617054f, -0.00194378383f, -0.174715757f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(1.67587972f, 0, -7.049135f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-0.984617054f, -0.00194378383f, -0.174715757f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(1.67587972f, 0, -7.049135f) - hit.Point).Length(), 3f);
var capsule = game.SceneSystem.SceneInstance.RootScene.Entities.First(ent => ent.Name == "CapsulePrefab1");
@ -123,29 +123,29 @@ namespace Stride.Physics.Tests
Assert.False(hit.Succeeded);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, 0.6f, 0.0f), capsule.Transform.Position + new Vector3(0.0f, 0.6f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0, 0.9758787f, -0.218313679f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, 1.5999999f, -7.03867149f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, 0.9758787f, -0.218313679f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(0, 1.5999999f, -7.03867149f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.65f, 0.0f), capsule.Transform.Position + new Vector3(0.0f, -0.65f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.6f, 0.0f), capsule.Transform.Position + new Vector3(0.0f, -0.6f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0, -0.999195457f, -0.0401064046f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, 0.399999917f, -7.007019f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, -0.999195457f, -0.0401064046f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(0, 0.399999917f, -7.007019f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.40f, 0.0f, 0.0f), capsule.Transform.Position + new Vector3(0.40f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.35f, 0.0f, 0.0f), capsule.Transform.Position + new Vector3(0.35f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0.9830295f, -0.0126968855f, -0.1830078f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0.35f, 0.99999994f, -7.049801f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0.9830295f, -0.0126968855f, -0.1830078f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(0.35f, 0.99999994f, -7.049801f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.40f, 0.0f, 0.0f), capsule.Transform.Position + new Vector3(-0.40f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((capsule.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.35f, 0.0f, 0.0f), capsule.Transform.Position + new Vector3(-0.35f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(-0.9830295f, -0.0126968855f, -0.1830078f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-0.35f, 0.99999994f, -7.049801f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-0.9830295f, -0.0126968855f, -0.1830078f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-0.35f, 0.99999994f, -7.049801f) - hit.Point).Length(), 3f);
var cone = game.SceneSystem.SceneInstance.RootScene.Entities.First(ent => ent.Name == "ConePrefab1");
@ -153,29 +153,29 @@ namespace Stride.Physics.Tests
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, 0.5f, 0.0f), cone.Transform.Position + new Vector3(0.0f, 0.5f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0, 0.5078509f, -0.8614451f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(1, 0.5f, -12.04643f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, 0.5078509f, -0.8614451f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(1, 0.5f, -12.04643f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.55f, 0.0f), cone.Transform.Position + new Vector3(0.0f, -0.55f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.5f, 0.0f), cone.Transform.Position + new Vector3(0.0f, -0.5f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0, 0, -1) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(1, -0.5f, -12.54f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0, 0, -1) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(1, -0.5f, -12.54f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.35f, 0.0f, 0.0f), cone.Transform.Position + new Vector3(0.35f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.3f, 0.0f, 0.0f), cone.Transform.Position + new Vector3(0.3f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0.8664685f, 0.4454662f, -0.2253714f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(1.3f, 0, -12.02208f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0.8664685f, 0.4454662f, -0.2253714f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(1.3f, 0, -12.02208f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.35f, 0.0f, 0.0f), cone.Transform.Position + new Vector3(-0.35f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((cone.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.3f, 0.0f, 0.0f), cone.Transform.Position + new Vector3(-0.3f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(-0.8664652f, 0.4454676f, -0.2253817f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0.7f, 0, -12.02208f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-0.8664652f, 0.4454676f, -0.2253817f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(0.7f, 0, -12.02208f) - hit.Point).Length(), 3f);
var compound1 = game.SceneSystem.SceneInstance.RootScene.Entities.First(ent => ent.Name == "Compound1");
@ -183,29 +183,29 @@ namespace Stride.Physics.Tests
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, 1.49f, 0.0f), compound1.Transform.Position + new Vector3(0.0f, 1.49f, 0.0f)); //compound margin is different
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0f, -1.146684E-06f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-3.866335f, 1.407022f, -17.4267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0f, -1.146684E-06f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-3.866335f, 1.407022f, -17.4267f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.55f, 0.0f), compound1.Transform.Position + new Vector3(0.0f, -0.55f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.5f, 0.0f), compound1.Transform.Position + new Vector3(0.0f, -0.5f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-3.866335f, -0.5829783f, -17.4267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-3.866335f, -0.5829783f, -17.4267f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(1.55f, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(1.55f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(1.49f, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(1.49f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0f, 7.166773E-08f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-2.376335f, -0.08297831f, -17.4267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0f, 7.166773E-08f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-2.376335f, -0.08297831f, -17.4267f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.55f, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(-0.55f, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.5f, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(-0.5f, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-4.366335f, -0.08297831f, -17.4267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-4.366335f, -0.08297831f, -17.4267f) - hit.Point).Length(), 3f);
var scaling = new Vector3(3, 2, 2);
@ -219,29 +219,29 @@ namespace Stride.Physics.Tests
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, 1.49f * 2, 0.0f), compound1.Transform.Position + new Vector3(0.0f, 1.49f * 2, 0.0f)); //compound margin is different
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(3.12393E-07f, 0f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-3.866335f, 2.897022f, -17.9267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(3.12393E-07f, 0f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-3.866335f, 2.897022f, -17.9267f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.55f * 2, 0.0f), compound1.Transform.Position + new Vector3(0.0f, -0.55f * 2, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(0.0f, -0.5f * 2, 0.0f), compound1.Transform.Position + new Vector3(0.0f, -0.5f * 2, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-3.866335f, -1.082978f, -17.9267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-3.866335f, -1.082978f, -17.9267f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(1.55f * 3, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(1.55f * 3, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(1.49f * 3, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(1.49f * 3, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0.6036654f, -0.08297831f, -17.9267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(0f, 0f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(0.6036654f, -0.08297831f, -17.9267f) - hit.Point).Length(), 3f);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.55f * 3, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(-0.55f * 3, 0.0f, 0.0f));
Assert.False(hit.Succeeded);
hit = simulation.Raycast((compound1.Transform.Position - Vector3.UnitZ * 2) + new Vector3(-0.5f * 3, 0.0f, 0.0f), compound1.Transform.Position + new Vector3(-0.5f * 3, 0.0f, 0.0f));
Assert.True(hit.Succeeded);
Assert.Equal(0.0f, (new Vector3(-2.861034E-06f, 3.889218E-06f, -1f) - hit.Normal).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-5.366335f, -0.08297831f, -17.9267f) - hit.Point).Length(), 3);
Assert.Equal(0.0f, (new Vector3(-2.861034E-06f, 3.889218E-06f, -1f) - hit.Normal).Length(), 3f);
Assert.Equal(0.0f, (new Vector3(-5.366335f, -0.08297831f, -17.9267f) - hit.Point).Length(), 3f);
game.Exit();
});

4
sources/engine/Stride.Shaders.Tests/Stride.Shaders.Tests.Windows.csproj
Просмотреть файл

@ -19,8 +19,8 @@
<Compile Remove="TestShaderParsing.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />
<ProjectReference Include="..\Stride.Assets\Stride.Assets.csproj" />
<ProjectReference Include="..\Stride.Engine\Stride.Engine.csproj" />

2
sources/engine/Stride/Stride.csproj
Просмотреть файл

@ -31,7 +31,7 @@
<ProjectReference Include="..\..\core\Stride.Core.Mathematics\Stride.Core.Mathematics.csproj" />
<!-- SharpDX is needed for WIC -->
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" Condition="'$(TargetFramework)' == '$(StrideFrameworkUWP)'" />
<PackageReference Include="System.Drawing.Common" Version="4.6.0" Condition="'$(TargetFramework)' == '$(StrideFramework)'" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" Condition="'$(TargetFramework)' == '$(StrideFramework)'" />
</ItemGroup>
<ItemGroup>

4
sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj
Просмотреть файл

@ -7,8 +7,8 @@
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\xunit.runner.stride\xunit.runner.stride.csproj" />

4
sources/presentation/Stride.Core.Presentation.Tests/Stride.Core.Presentation.Tests.csproj
Просмотреть файл

@ -7,8 +7,8 @@
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"/>
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">

4
sources/presentation/Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj
Просмотреть файл

@ -8,8 +8,8 @@
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">

4
sources/targets/Stride.UnitTests.targets
Просмотреть файл

@ -84,8 +84,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.23" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.32" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

4
sources/tests/tools/Stride.TextureConverter.Tests/Stride.TextureConverter.Tests.csproj
Просмотреть файл

@ -8,8 +8,8 @@
<StrideCompilerTargetsEnable Condition="'$(StridePackageBuild)' == 'true'">false</StrideCompilerTargetsEnable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\data\tests\TextureConverter\**\*.*">

3
sources/tests/xunit.runner.stride/StrideXunitRunner.cs
Просмотреть файл

@ -1,7 +1,6 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Logging.Serilog;
using Avalonia.ReactiveUI;
using xunit.runner.stride.ViewModels;
using xunit.runner.stride.Views;
@ -19,7 +18,7 @@ namespace xunit.runner.stride
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.LogToDebug()
.LogToTrace()
.UseReactiveUI();
// Your application's entry point. Here you can initialize your MVVM framework, DI

3
sources/tests/xunit.runner.stride/Views/MainWindow.xaml.cs
Просмотреть файл

@ -9,9 +9,6 @@ namespace xunit.runner.stride.Views
public MainWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}
private void InitializeComponent()

12
sources/tests/xunit.runner.stride/xunit.runner.stride.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.22" ToolsVersion="Current">
<Import Project="..\..\targets\Stride.Core.TargetFrameworks.Editor.props" />
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<StrideSkipAutoPack>false</StrideSkipAutoPack>
<IsPackable>true</IsPackable>
</PropertyGroup>
@ -15,11 +15,11 @@
<AvaloniaResource Include="Assets\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.9.0-preview7" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.0-preview7" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.0-preview7" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" />
<PackageReference Include="Avalonia" Version="0.10.11" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.11" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.11" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.utility" Version="2.4.2-pre.12" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />

4
sources/tools/Stride.Code.Tests/Stride.Code.Tests.csproj
Просмотреть файл

@ -7,8 +7,8 @@
<StrideCompilerTargetsEnable Condition="'$(StridePackageBuild)' == 'true'">false</StrideCompilerTargetsEnable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Stride.FixProjectReferences\Stride.FixProjectReferences.csproj" />

4
sources/tools/Stride.Core.ProjectTemplating.Tests/Stride.Core.ProjectTemplating.Tests.csproj
Просмотреть файл

@ -18,8 +18,8 @@
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<ItemGroup>
<None Include="Test\%24ProjectName%24.cs.tt">

2
sources/tools/Stride.Graphics.RenderDocPlugin/Stride.Graphics.RenderDocPlugin.csproj
Просмотреть файл

@ -5,7 +5,7 @@
</PropertyGroup>
<Import Project="..\..\targets\Stride.props" />
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
</ItemGroup>

12
sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj
Просмотреть файл

@ -1,6 +1,5 @@
<Project>
<Import Project="Sdk.props" Condition="'$(StrideNuGetLoaderWindowsDesktop)' != 'true'" Sdk="Microsoft.NET.Sdk" />
<Import Project="Sdk.props" Condition="'$(StrideNuGetLoaderWindowsDesktop)' == 'true'" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
@ -18,9 +17,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NuGet.PackageManagement" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Resolver" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Commands" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.PackageManagement" Version="6.0.0" />
<PackageReference Include="NuGet.Resolver" Version="6.0.0" />
<PackageReference Include="NuGet.Commands" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
@ -37,6 +36,5 @@
</Page>
</ItemGroup>
<Import Project="Sdk.targets" Condition="'$(StrideNuGetLoaderWindowsDesktop)' != 'true'" Sdk="Microsoft.NET.Sdk" />
<Import Project="Sdk.targets" Condition="'$(StrideNuGetLoaderWindowsDesktop)' == 'true'" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>

2
sources/tools/Stride.ProjectGenerator/Stride.ProjectGenerator.csproj
Просмотреть файл

@ -15,7 +15,7 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
</ItemGroup>
<ItemGroup>

2
sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj
Просмотреть файл

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ServiceWire" Version="5.3.4" />
</ItemGroup>

12
sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj
Просмотреть файл

@ -12,10 +12,10 @@
<StrideCompilerTargetsEnable Condition="'$(StridePackageBuild)' == 'true'">false</StrideCompilerTargetsEnable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EnvDTE" Version="8.0.1">
<PackageReference Include="EnvDTE" Version="17.0.31902.203">
<EmbedInteropTypes>True</EmbedInteropTypes>
</PackageReference>
<PackageReference Include="EnvDTE80" Version="8.0.1">
<PackageReference Include="EnvDTE80" Version="17.0.31902.203">
<EmbedInteropTypes>True</EmbedInteropTypes>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Imaging" Version="14.0.23205" />
@ -33,13 +33,13 @@
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="14.0.51107" />
<PackageReference Include="Microsoft.VisualStudio.Utilities" Version="14.0.23205" />
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="14.0.51103" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="stdole" Version="7.0.3301">
<EmbedInteropTypes>True</EmbedInteropTypes>
</PackageReference>
<PackageReference Include="Xunit.StaFact" Version="0.2.9" />
<PackageReference Include="vslangproj" Version="7.0.3300">
<PackageReference Include="Xunit.StaFact" Version="1.1.5-alpha" />
<PackageReference Include="vslangproj" Version="17.0.31902.203">
<EmbedInteropTypes>True</EmbedInteropTypes>
</PackageReference>
</ItemGroup>

2
sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj
Просмотреть файл

@ -34,7 +34,7 @@
</PackageReference>
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" ExcludeAssets="runtime" />
<PackageReference Include="NuGet.Commands" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Commands" Version="6.0.0" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Design" />