From 23644db1c16c42cae934b22ca5a3a38a402183ef Mon Sep 17 00:00:00 2001 From: Eideren Date: Thu, 13 Jan 2022 19:28:00 +0100 Subject: [PATCH] [Build] Fix latest nuget and update packages --- build/compile.bat | 68 +--------------- samples/Tests/Stride.Samples.Tests.csproj | 4 +- .../Stride.Core.Assets.Quantum.Tests.csproj | 4 +- .../Stride.Core.Assets.Quantum.csproj | 4 +- .../Stride.Core.Assets.Tests.csproj | 4 +- .../PackageSession.Dependencies.cs | 20 ----- .../Stride.Core.Assets.csproj | 4 +- .../Stride.Core.Packages.csproj | 8 +- .../Stride.Core.BuildEngine.Tests.csproj | 4 +- .../Stride.Core.Design.Tests.csproj | 4 +- .../Stride.Core.Design.csproj | 4 +- .../Stride.Core.Mathematics.Tests.csproj | 4 +- .../Stride.Core.Tasks.csproj | 4 +- .../Stride.Core.Tests.csproj | 4 +- .../Stride.Core.Yaml.Tests.csproj | 4 +- sources/core/Stride.Core/Stride.Core.csproj | 2 +- .../ScriptEditor/SimpleCodeTextEditor.cs | 14 ++-- .../Stride.Assets.Presentation.csproj | 20 ++--- .../Stride.Core.Assets.Editor.Tests.csproj | 4 +- .../Stride.Core.Assets.Editor.csproj | 2 +- .../editor/Stride.Editor/Stride.Editor.csproj | 4 +- .../Stride.GameStudio.Tests.csproj | 4 +- .../Stride.Assets.Tests.csproj | 4 +- .../Stride.Assets.Tests2.csproj | 8 +- .../engine/Stride.Assets/Stride.Assets.csproj | 10 +-- .../Stride.Graphics.Regression.csproj | 6 +- .../Stride.Physics.Tests/CharacterTest.cs | 12 +-- .../ColliderShapesTest.cs | 80 +++++++++---------- .../Stride.Shaders.Tests.Windows.csproj | 4 +- sources/engine/Stride/Stride.csproj | 2 +- ...ide.Core.Presentation.Quantum.Tests.csproj | 4 +- .../Stride.Core.Presentation.Tests.csproj | 4 +- .../Stride.Core.Quantum.Tests.csproj | 4 +- sources/targets/Stride.UnitTests.targets | 4 +- .../Stride.TextureConverter.Tests.csproj | 4 +- .../xunit.runner.stride/StrideXunitRunner.cs | 3 +- .../Views/MainWindow.xaml.cs | 3 - .../xunit.runner.stride.csproj | 12 +-- .../Stride.Code.Tests.csproj | 4 +- ...Stride.Core.ProjectTemplating.Tests.csproj | 4 +- .../Stride.Graphics.RenderDocPlugin.csproj | 2 +- .../Stride.NuGetLoader.csproj | 12 ++- .../Stride.ProjectGenerator.csproj | 2 +- ...de.VisualStudio.Commands.Interfaces.csproj | 2 +- .../Stride.VisualStudio.Package.Tests.csproj | 12 +-- .../Stride.VisualStudio.Package.csproj | 2 +- 46 files changed, 152 insertions(+), 246 deletions(-) diff --git a/build/compile.bat b/build/compile.bat index e6dcf21ed..3c4f12dcc 100644 --- a/build/compile.bat +++ b/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: diff --git a/samples/Tests/Stride.Samples.Tests.csproj b/samples/Tests/Stride.Samples.Tests.csproj index b6d388cf6..5331c2e36 100644 --- a/samples/Tests/Stride.Samples.Tests.csproj +++ b/samples/Tests/Stride.Samples.Tests.csproj @@ -10,8 +10,8 @@ true - - + + diff --git a/sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj b/sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj index 8fc86a10b..3556abbab 100644 --- a/sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj +++ b/sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj @@ -6,8 +6,8 @@ WindowsTools - - + + diff --git a/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj b/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj index 2ddb7da7b..cfdee27c3 100644 --- a/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj +++ b/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj @@ -13,8 +13,8 @@ true - - + + diff --git a/sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj b/sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj index 894481dd6..7be328799 100644 --- a/sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj +++ b/sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj @@ -10,8 +10,8 @@ xunit.runner.stride.Program - - + + diff --git a/sources/assets/Stride.Core.Assets/PackageSession.Dependencies.cs b/sources/assets/Stride.Core.Assets/PackageSession.Dependencies.cs index 9e7a914c5..000d4aff6 100644 --- a/sources/assets/Stride.Core.Assets/PackageSession.Dependencies.cs +++ b/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( diff --git a/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj b/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj index 76477cdc5..9d1eca730 100644 --- a/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj +++ b/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj @@ -11,9 +11,9 @@ true - + - + diff --git a/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj b/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj index dc1a89a22..20c30b71a 100644 --- a/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj +++ b/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj @@ -7,10 +7,10 @@ --auto-module-initializer --serialization - - - - + + + + diff --git a/sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj b/sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj index 082033999..da9d73486 100644 --- a/sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj +++ b/sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj b/sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj index c1a22708b..b42dcf428 100644 --- a/sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj +++ b/sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj @@ -8,8 +8,8 @@ WindowsTools - - + + diff --git a/sources/core/Stride.Core.Design/Stride.Core.Design.csproj b/sources/core/Stride.Core.Design/Stride.Core.Design.csproj index ebb236636..f61c3a6bf 100644 --- a/sources/core/Stride.Core.Design/Stride.Core.Design.csproj +++ b/sources/core/Stride.Core.Design/Stride.Core.Design.csproj @@ -27,9 +27,9 @@ - + - + diff --git a/sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj b/sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj index e35d76bdf..16aaf1ae0 100644 --- a/sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj +++ b/sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj @@ -11,8 +11,8 @@ ..\..\..\Bin\Tests\$(AssemblyName)\$(StridePlatform) - - + + diff --git a/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj b/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj index 221db60bf..3e315edcd 100644 --- a/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj +++ b/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj @@ -20,9 +20,9 @@ False ..\..\..\deps\libgit2\LibGit2Sharp.dll - + - + True diff --git a/sources/core/Stride.Core.Tests/Stride.Core.Tests.csproj b/sources/core/Stride.Core.Tests/Stride.Core.Tests.csproj index 523505e7c..e21ad531a 100644 --- a/sources/core/Stride.Core.Tests/Stride.Core.Tests.csproj +++ b/sources/core/Stride.Core.Tests/Stride.Core.Tests.csproj @@ -8,8 +8,8 @@ Windows;Android;iOS - - + + diff --git a/sources/core/Stride.Core.Yaml.Tests/Stride.Core.Yaml.Tests.csproj b/sources/core/Stride.Core.Yaml.Tests/Stride.Core.Yaml.Tests.csproj index 557b750af..6e091fae5 100644 --- a/sources/core/Stride.Core.Yaml.Tests/Stride.Core.Yaml.Tests.csproj +++ b/sources/core/Stride.Core.Yaml.Tests/Stride.Core.Yaml.Tests.csproj @@ -8,8 +8,8 @@ WindowsTools - - + + diff --git a/sources/core/Stride.Core/Stride.Core.csproj b/sources/core/Stride.Core/Stride.Core.csproj index 99e9e943a..767bb783e 100644 --- a/sources/core/Stride.Core/Stride.Core.csproj +++ b/sources/core/Stride.Core/Stride.Core.csproj @@ -22,7 +22,7 @@ - + diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs index 832c6b771..4387db2b2 100644 --- a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs +++ b/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) { diff --git a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj index 941d1ac67..9c3af031b 100644 --- a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj +++ b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj @@ -15,21 +15,15 @@ false - - + + - - - - $(StrideCommonDependenciesDir)RoslynPad\netcoreapp3.1\RoslynPad.Editor.Windows.dll - - - $(StrideCommonDependenciesDir)RoslynPad\netcoreapp3.1\RoslynPad.Roslyn.Windows.dll - - - $(StrideCommonDependenciesDir)RoslynPad\netcoreapp3.1\RoslynPad.Roslyn.dll - + + + + + diff --git a/sources/editor/Stride.Core.Assets.Editor.Tests/Stride.Core.Assets.Editor.Tests.csproj b/sources/editor/Stride.Core.Assets.Editor.Tests/Stride.Core.Assets.Editor.Tests.csproj index 5702f1439..ae13cfed8 100644 --- a/sources/editor/Stride.Core.Assets.Editor.Tests/Stride.Core.Assets.Editor.Tests.csproj +++ b/sources/editor/Stride.Core.Assets.Editor.Tests/Stride.Core.Assets.Editor.Tests.csproj @@ -6,8 +6,8 @@ WindowsTools - - + + diff --git a/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj b/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj index 7d147d3f7..f8af4f7ac 100644 --- a/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj +++ b/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj @@ -10,7 +10,7 @@ false - + diff --git a/sources/editor/Stride.Editor/Stride.Editor.csproj b/sources/editor/Stride.Editor/Stride.Editor.csproj index 3a5d451fc..95a981f36 100644 --- a/sources/editor/Stride.Editor/Stride.Editor.csproj +++ b/sources/editor/Stride.Editor/Stride.Editor.csproj @@ -12,8 +12,8 @@ false - - + + diff --git a/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj b/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj index cb5a18b36..77feb9589 100644 --- a/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj +++ b/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj @@ -6,8 +6,8 @@ WindowsTools - - + + diff --git a/sources/engine/Stride.Assets.Tests/Stride.Assets.Tests.csproj b/sources/engine/Stride.Assets.Tests/Stride.Assets.Tests.csproj index c841a4b85..3e5047d3c 100644 --- a/sources/engine/Stride.Assets.Tests/Stride.Assets.Tests.csproj +++ b/sources/engine/Stride.Assets.Tests/Stride.Assets.Tests.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/sources/engine/Stride.Assets.Tests2/Stride.Assets.Tests2.csproj b/sources/engine/Stride.Assets.Tests2/Stride.Assets.Tests2.csproj index 4100ea0f7..a553be997 100644 --- a/sources/engine/Stride.Assets.Tests2/Stride.Assets.Tests2.csproj +++ b/sources/engine/Stride.Assets.Tests2/Stride.Assets.Tests2.csproj @@ -10,10 +10,10 @@ Stride.Assets.Tests2 - - - - + + + + diff --git a/sources/engine/Stride.Assets/Stride.Assets.csproj b/sources/engine/Stride.Assets/Stride.Assets.csproj index c744021b1..c60f95657 100644 --- a/sources/engine/Stride.Assets/Stride.Assets.csproj +++ b/sources/engine/Stride.Assets/Stride.Assets.csproj @@ -13,13 +13,13 @@ STRIDE_VIDEO_FFMPEG;$(DefineConstants) - - + + - - + + @@ -31,7 +31,7 @@ - + diff --git a/sources/engine/Stride.Graphics.Regression/Stride.Graphics.Regression.csproj b/sources/engine/Stride.Graphics.Regression/Stride.Graphics.Regression.csproj index 724515038..152cbc6d8 100644 --- a/sources/engine/Stride.Graphics.Regression/Stride.Graphics.Regression.csproj +++ b/sources/engine/Stride.Graphics.Regression/Stride.Graphics.Regression.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/sources/engine/Stride.Physics.Tests/CharacterTest.cs b/sources/engine/Stride.Physics.Tests/CharacterTest.cs index f5efe2254..eb9625101 100644 --- a/sources/engine/Stride.Physics.Tests/CharacterTest.cs +++ b/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); diff --git a/sources/engine/Stride.Physics.Tests/ColliderShapesTest.cs b/sources/engine/Stride.Physics.Tests/ColliderShapesTest.cs index a80ee072d..cd39ab15a 100644 --- a/sources/engine/Stride.Physics.Tests/ColliderShapesTest.cs +++ b/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(); }); diff --git a/sources/engine/Stride.Shaders.Tests/Stride.Shaders.Tests.Windows.csproj b/sources/engine/Stride.Shaders.Tests/Stride.Shaders.Tests.Windows.csproj index 45ebcffdb..2003757d6 100644 --- a/sources/engine/Stride.Shaders.Tests/Stride.Shaders.Tests.Windows.csproj +++ b/sources/engine/Stride.Shaders.Tests/Stride.Shaders.Tests.Windows.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/sources/engine/Stride/Stride.csproj b/sources/engine/Stride/Stride.csproj index c167dfcad..77f77de40 100644 --- a/sources/engine/Stride/Stride.csproj +++ b/sources/engine/Stride/Stride.csproj @@ -31,7 +31,7 @@ - + diff --git a/sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj b/sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj index dcdbc2169..f50a64f30 100644 --- a/sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj +++ b/sources/presentation/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj @@ -7,8 +7,8 @@ true - - + + diff --git a/sources/presentation/Stride.Core.Presentation.Tests/Stride.Core.Presentation.Tests.csproj b/sources/presentation/Stride.Core.Presentation.Tests/Stride.Core.Presentation.Tests.csproj index d90ae6ac6..e29bca003 100644 --- a/sources/presentation/Stride.Core.Presentation.Tests/Stride.Core.Presentation.Tests.csproj +++ b/sources/presentation/Stride.Core.Presentation.Tests/Stride.Core.Presentation.Tests.csproj @@ -7,8 +7,8 @@ true - - + + diff --git a/sources/presentation/Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj b/sources/presentation/Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj index 5c7e42a43..e49140e67 100644 --- a/sources/presentation/Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj +++ b/sources/presentation/Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj @@ -8,8 +8,8 @@ --auto-module-initializer --serialization - - + + diff --git a/sources/targets/Stride.UnitTests.targets b/sources/targets/Stride.UnitTests.targets index 66520fe58..436f24437 100644 --- a/sources/targets/Stride.UnitTests.targets +++ b/sources/targets/Stride.UnitTests.targets @@ -84,8 +84,8 @@ - - + + diff --git a/sources/tests/tools/Stride.TextureConverter.Tests/Stride.TextureConverter.Tests.csproj b/sources/tests/tools/Stride.TextureConverter.Tests/Stride.TextureConverter.Tests.csproj index 9a709fea5..5c9470179 100644 --- a/sources/tests/tools/Stride.TextureConverter.Tests/Stride.TextureConverter.Tests.csproj +++ b/sources/tests/tools/Stride.TextureConverter.Tests/Stride.TextureConverter.Tests.csproj @@ -8,8 +8,8 @@ false - - + + diff --git a/sources/tests/xunit.runner.stride/StrideXunitRunner.cs b/sources/tests/xunit.runner.stride/StrideXunitRunner.cs index 24c0e98b7..730730e0f 100644 --- a/sources/tests/xunit.runner.stride/StrideXunitRunner.cs +++ b/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() .UsePlatformDetect() - .LogToDebug() + .LogToTrace() .UseReactiveUI(); // Your application's entry point. Here you can initialize your MVVM framework, DI diff --git a/sources/tests/xunit.runner.stride/Views/MainWindow.xaml.cs b/sources/tests/xunit.runner.stride/Views/MainWindow.xaml.cs index 8e2adf3db..60c8abe25 100644 --- a/sources/tests/xunit.runner.stride/Views/MainWindow.xaml.cs +++ b/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() diff --git a/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj b/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj index 09a316a89..f891543df 100644 --- a/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj +++ b/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0 false true @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/sources/tools/Stride.Code.Tests/Stride.Code.Tests.csproj b/sources/tools/Stride.Code.Tests/Stride.Code.Tests.csproj index 1992f5046..73dc82ff9 100644 --- a/sources/tools/Stride.Code.Tests/Stride.Code.Tests.csproj +++ b/sources/tools/Stride.Code.Tests/Stride.Code.Tests.csproj @@ -7,8 +7,8 @@ false - - + + diff --git a/sources/tools/Stride.Core.ProjectTemplating.Tests/Stride.Core.ProjectTemplating.Tests.csproj b/sources/tools/Stride.Core.ProjectTemplating.Tests/Stride.Core.ProjectTemplating.Tests.csproj index 0c151d3c7..34d9c9acc 100644 --- a/sources/tools/Stride.Core.ProjectTemplating.Tests/Stride.Core.ProjectTemplating.Tests.csproj +++ b/sources/tools/Stride.Core.ProjectTemplating.Tests/Stride.Core.ProjectTemplating.Tests.csproj @@ -18,8 +18,8 @@ TRACE - - + + diff --git a/sources/tools/Stride.Graphics.RenderDocPlugin/Stride.Graphics.RenderDocPlugin.csproj b/sources/tools/Stride.Graphics.RenderDocPlugin/Stride.Graphics.RenderDocPlugin.csproj index ee637d53c..72b875df2 100644 --- a/sources/tools/Stride.Graphics.RenderDocPlugin/Stride.Graphics.RenderDocPlugin.csproj +++ b/sources/tools/Stride.Graphics.RenderDocPlugin/Stride.Graphics.RenderDocPlugin.csproj @@ -5,7 +5,7 @@ - net6.0 + net6.0 diff --git a/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj b/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj index a216d678e..4f895bf1b 100644 --- a/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj +++ b/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj @@ -1,6 +1,5 @@  - - + Exe @@ -18,9 +17,9 @@ - - - + + + @@ -37,6 +36,5 @@ - - + diff --git a/sources/tools/Stride.ProjectGenerator/Stride.ProjectGenerator.csproj b/sources/tools/Stride.ProjectGenerator/Stride.ProjectGenerator.csproj index d4487d29e..b52891584 100644 --- a/sources/tools/Stride.ProjectGenerator/Stride.ProjectGenerator.csproj +++ b/sources/tools/Stride.ProjectGenerator/Stride.ProjectGenerator.csproj @@ -15,7 +15,7 @@ true - + diff --git a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj index 4da547bd1..e683f5e90 100644 --- a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj +++ b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj @@ -7,7 +7,7 @@ - + diff --git a/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj b/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj index 932b8556f..6d9ec396b 100644 --- a/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj +++ b/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj @@ -12,10 +12,10 @@ false - + True - + True @@ -33,13 +33,13 @@ - - + + True - - + + True diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj index 7b1195d7d..4003af9e7 100644 --- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj +++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj @@ -34,7 +34,7 @@ - +