From 329becbecf0c392b37feb5c8bc6007bd4ee2f567 Mon Sep 17 00:00:00 2001 From: Nicolas Musset Date: Mon, 16 Oct 2023 20:07:25 +0200 Subject: [PATCH] [Editor] Remove some windows dependencies in editor libraries (#1908) --- samples/Tests/Stride.Samples.Tests.csproj | 2 +- .../Stride.Core.Assets.Quantum.Tests.csproj | 2 +- .../Stride.Core.Assets.Quantum.csproj | 2 -- .../Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj | 2 +- .../Stride.Assets.Presentation.csproj | 2 +- .../Stride.Core.Assets.Editor.Tests.csproj | 2 +- .../Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj | 2 +- sources/editor/Stride.Editor/Stride.Editor.csproj | 2 +- .../Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj | 2 +- sources/editor/Stride.GameStudio/Stride.GameStudio.csproj | 2 +- .../Stride.Core.Presentation.Dialogs.csproj | 2 +- .../Stride.Core.Presentation.Graph.csproj | 2 +- .../Stride.Core.Presentation.Quantum.Tests.csproj | 2 +- .../Stride.Core.Presentation.Quantum.csproj | 2 +- .../Stride.Core.Presentation.Tests.csproj | 2 +- .../Stride.Core.Presentation/Stride.Core.Presentation.csproj | 2 +- .../Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj | 2 +- .../Stride.Core.Translation.Presentation.csproj | 2 +- sources/targets/Stride.Core.TargetFrameworks.Editor.props | 3 ++- .../Stride.ConnectionRouter/Stride.ConnectionRouter.csproj | 2 +- .../Stride.Core.Translation.Extractor.csproj | 2 +- .../Stride.EffectCompilerServer.csproj | 2 +- sources/tools/Stride.Importer.FBX/Stride.Importer.FBX.vcxproj | 2 +- .../Stride.SamplesTestServer/Stride.SamplesTestServer.csproj | 2 +- sources/tools/Stride.TestRunner/Stride.TestRunner.csproj | 2 +- 25 files changed, 25 insertions(+), 26 deletions(-) diff --git a/samples/Tests/Stride.Samples.Tests.csproj b/samples/Tests/Stride.Samples.Tests.csproj index 440d2b42a..d9611452f 100644 --- a/samples/Tests/Stride.Samples.Tests.csproj +++ b/samples/Tests/Stride.Samples.Tests.csproj @@ -3,7 +3,7 @@ - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 true --auto-module-initializer 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 3556abbab..d0c66dbe4 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 @@ -1,7 +1,7 @@  - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 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 d05d13b28..bfaaa02f5 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 @@ -9,8 +9,6 @@ --auto-module-initializer --serialization ..\..\..\build\ true - true - 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 7be328799..94236cb15 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 @@ -1,7 +1,7 @@  - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 true --auto-module-initializer --serialization diff --git a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj index 9c3af031b..8976f5ac5 100644 --- a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj +++ b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj @@ -5,7 +5,7 @@ true true true - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 false --auto-module-initializer --serialization --parameter-key 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 ae13cfed8..654ce696e 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 @@ -1,7 +1,7 @@ - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 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 349a10968..faac7ef0a 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 @@ -2,7 +2,7 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) true --auto-module-initializer --serialization true diff --git a/sources/editor/Stride.Editor/Stride.Editor.csproj b/sources/editor/Stride.Editor/Stride.Editor.csproj index 95a981f36..639a5db1a 100644 --- a/sources/editor/Stride.Editor/Stride.Editor.csproj +++ b/sources/editor/Stride.Editor/Stride.Editor.csproj @@ -4,7 +4,7 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true true - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 false true diff --git a/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj b/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj index 77feb9589..81cbdf34d 100644 --- a/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj +++ b/sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj @@ -1,7 +1,7 @@  - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 WindowsTools diff --git a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj index f6d59e99f..3df19dfa4 100644 --- a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj +++ b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj @@ -6,7 +6,7 @@ WinExe {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 false true diff --git a/sources/presentation/Stride.Core.Presentation.Dialogs/Stride.Core.Presentation.Dialogs.csproj b/sources/presentation/Stride.Core.Presentation.Dialogs/Stride.Core.Presentation.Dialogs.csproj index bd6978d44..317a9bc8c 100644 --- a/sources/presentation/Stride.Core.Presentation.Dialogs/Stride.Core.Presentation.Dialogs.csproj +++ b/sources/presentation/Stride.Core.Presentation.Dialogs/Stride.Core.Presentation.Dialogs.csproj @@ -4,7 +4,7 @@ 8.0.30703 2.0 WindowsTools - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) true --auto-module-initializer true diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj b/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj index e3de1a49d..88f38c58e 100644 --- a/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj +++ b/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj @@ -4,7 +4,7 @@ 8.0.30703 2.0 WindowsTools - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) true --auto-module-initializer --serialization ..\..\..\..\build\ 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 f50a64f30..09f657064 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 @@ -1,7 +1,7 @@ - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 WindowsTools true diff --git a/sources/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj b/sources/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj index 0c655f31b..af859bf7c 100644 --- a/sources/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj +++ b/sources/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj @@ -5,7 +5,7 @@ true --auto-module-initializer --serialization - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) true false 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 e29bca003..e6b8321cd 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 @@ -1,7 +1,7 @@ - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 WindowsTools true diff --git a/sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj b/sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj index de32afed5..1c354d92a 100644 --- a/sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj +++ b/sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj @@ -4,7 +4,7 @@ WindowsTools - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) true --auto-module-initializer --serialization 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 e49140e67..d5102d684 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 @@ -1,7 +1,7 @@  - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) win7-x64 WindowsTools true diff --git a/sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj b/sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj index 570e0e017..778212a0f 100644 --- a/sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj +++ b/sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj @@ -4,7 +4,7 @@ 8.0.30703 2.0 true - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools true --auto-module-initializer --serialization diff --git a/sources/targets/Stride.Core.TargetFrameworks.Editor.props b/sources/targets/Stride.Core.TargetFrameworks.Editor.props index 00abb0d95..c1406f12b 100644 --- a/sources/targets/Stride.Core.TargetFrameworks.Editor.props +++ b/sources/targets/Stride.Core.TargetFrameworks.Editor.props @@ -2,7 +2,8 @@ - net6.0-windows7.0 + net6.0 + net6.0-windows7.0 diff --git a/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj b/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj index 45a519fbb..ddbb2ee3c 100644 --- a/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj +++ b/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj @@ -4,7 +4,7 @@ 8.0.30703 2.0 WinExe - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools true --auto-module-initializer diff --git a/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj b/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj index 90f08d338..305f5bedd 100644 --- a/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj +++ b/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj @@ -5,7 +5,7 @@ 2.0 {164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1} Exe - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools true --auto-module-initializer --serialization diff --git a/sources/tools/Stride.EffectCompilerServer/Stride.EffectCompilerServer.csproj b/sources/tools/Stride.EffectCompilerServer/Stride.EffectCompilerServer.csproj index 3985a6cf2..0f124960a 100644 --- a/sources/tools/Stride.EffectCompilerServer/Stride.EffectCompilerServer.csproj +++ b/sources/tools/Stride.EffectCompilerServer/Stride.EffectCompilerServer.csproj @@ -5,7 +5,7 @@ 8.0.30703 2.0 Exe - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools true diff --git a/sources/tools/Stride.Importer.FBX/Stride.Importer.FBX.vcxproj b/sources/tools/Stride.Importer.FBX/Stride.Importer.FBX.vcxproj index f1b6046d2..35c0d5734 100644 --- a/sources/tools/Stride.Importer.FBX/Stride.Importer.FBX.vcxproj +++ b/sources/tools/Stride.Importer.FBX/Stride.Importer.FBX.vcxproj @@ -3,7 +3,7 @@ Cpp - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools diff --git a/sources/tools/Stride.SamplesTestServer/Stride.SamplesTestServer.csproj b/sources/tools/Stride.SamplesTestServer/Stride.SamplesTestServer.csproj index aaee6b111..d4619f3cd 100644 --- a/sources/tools/Stride.SamplesTestServer/Stride.SamplesTestServer.csproj +++ b/sources/tools/Stride.SamplesTestServer/Stride.SamplesTestServer.csproj @@ -2,7 +2,7 @@ Exe - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools true diff --git a/sources/tools/Stride.TestRunner/Stride.TestRunner.csproj b/sources/tools/Stride.TestRunner/Stride.TestRunner.csproj index 7d5afd103..54be4a9ae 100644 --- a/sources/tools/Stride.TestRunner/Stride.TestRunner.csproj +++ b/sources/tools/Stride.TestRunner/Stride.TestRunner.csproj @@ -2,7 +2,7 @@ Exe - $(StrideEditorTargetFramework) + $(StrideEditorAppTargetFramework) WindowsTools false false