From 153bd7f1a1a0ea88341f13f0a8aa55a279c15898 Mon Sep 17 00:00:00 2001 From: Rick van Dam Date: Wed, 24 Jun 2020 18:22:18 +0200 Subject: [PATCH] set GenerateResourceUsePreserializedResources only for projects that actually need it instead of a global props --- Directory.Build.props | 1 - .../Editor/DualityEditor/DualityEditor.csproj | 1 + .../EditorBase/EditorBase.Editor.csproj | 130 +++++++------- .../CamView/CamView.Editor.csproj | 130 +++++++------- .../HelpAdvisor/HelpAdvisor.Editor.csproj | 110 ++++++------ .../LogView/LogView.Editor.csproj | 130 +++++++------- .../ObjectInspector.Editor.csproj | 130 +++++++------- .../ProjectView/ProjectView.Editor.csproj | 156 ++++++++--------- .../SceneView/SceneView.Editor.csproj | 108 ++++++------ .../Tilemaps/Editor/Tilemaps.Editor.csproj | 158 +++++++++--------- Test/Core/DualityTests.csproj | 1 + Test/Editor/DualityEditorTests.csproj | 91 +++++----- 12 files changed, 582 insertions(+), 564 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f856839b1..15114cfc1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,6 @@ 1701;1702;CS1591;CS0419 $(DefaultItemExcludes);Content\** $(MSBuildThisFileDirectory) - true diff --git a/Source/Editor/DualityEditor/DualityEditor.csproj b/Source/Editor/DualityEditor/DualityEditor.csproj index 527682853..aa39b7b75 100644 --- a/Source/Editor/DualityEditor/DualityEditor.csproj +++ b/Source/Editor/DualityEditor/DualityEditor.csproj @@ -13,6 +13,7 @@ DualityLogoIcon.ico app.manifest true + true diff --git a/Source/Plugins/EditorBase/EditorBase.Editor.csproj b/Source/Plugins/EditorBase/EditorBase.Editor.csproj index c6138f550..e13493f3c 100644 --- a/Source/Plugins/EditorBase/EditorBase.Editor.csproj +++ b/Source/Plugins/EditorBase/EditorBase.Editor.csproj @@ -1,74 +1,76 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.Base - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.Base + true + true + true + - - - 2.8.2 - - - 1.1.17 - - + + + 2.8.2 + + + 1.1.17 + + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - ResXFileCodeGenerator - EditorBaseRes.Designer.cs - Designer - - - True - EditorBaseRes.resx - True - - + + ResXFileCodeGenerator + EditorBaseRes.Designer.cs + Designer + + + True + EditorBaseRes.resx + True + + - - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/Source/Plugins/EditorModules/CamView/CamView.Editor.csproj b/Source/Plugins/EditorModules/CamView/CamView.Editor.csproj index ed27b7284..7040abf02 100644 --- a/Source/Plugins/EditorModules/CamView/CamView.Editor.csproj +++ b/Source/Plugins/EditorModules/CamView/CamView.Editor.csproj @@ -1,74 +1,76 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.CamView - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.CamView + true + true + true + - - - 2.8.2 - - - 1.1.17 - - + + + 2.8.2 + + + 1.1.17 + + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - ResXFileCodeGenerator - CamViewRes.Designer.cs - Designer - - - True - CamViewRes.resx - True - - + + ResXFileCodeGenerator + CamViewRes.Designer.cs + Designer + + + True + CamViewRes.resx + True + + - - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/Source/Plugins/EditorModules/HelpAdvisor/HelpAdvisor.Editor.csproj b/Source/Plugins/EditorModules/HelpAdvisor/HelpAdvisor.Editor.csproj index 83c9863a6..c57d189b0 100644 --- a/Source/Plugins/EditorModules/HelpAdvisor/HelpAdvisor.Editor.csproj +++ b/Source/Plugins/EditorModules/HelpAdvisor/HelpAdvisor.Editor.csproj @@ -1,63 +1,65 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.HelpAdvisor - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.HelpAdvisor + true + true + true + - - - 2.8.2 - - - 1.1.17 - - + + + 2.8.2 + + + 1.1.17 + + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + - - - ResXFileCodeGenerator - HelpAdvisorRes.Designer.cs - Designer - - - True - HelpAdvisorRes.resx - True - - + + + ResXFileCodeGenerator + HelpAdvisorRes.Designer.cs + Designer + + + True + HelpAdvisorRes.resx + True + + - - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/Source/Plugins/EditorModules/LogView/LogView.Editor.csproj b/Source/Plugins/EditorModules/LogView/LogView.Editor.csproj index 083a6f38f..e74b73fd0 100644 --- a/Source/Plugins/EditorModules/LogView/LogView.Editor.csproj +++ b/Source/Plugins/EditorModules/LogView/LogView.Editor.csproj @@ -1,74 +1,76 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.LogView - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.LogView + true + true + true + - - - 2.8.2 - - - 1.1.17 - - + + + 2.8.2 + + + 1.1.17 + + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - ResXFileCodeGenerator - LogViewRes.Designer.cs - Designer - - - True - LogViewRes.resx - True - - + + ResXFileCodeGenerator + LogViewRes.Designer.cs + Designer + + + True + LogViewRes.resx + True + + - - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/Source/Plugins/EditorModules/ObjectInspector/ObjectInspector.Editor.csproj b/Source/Plugins/EditorModules/ObjectInspector/ObjectInspector.Editor.csproj index ec0bbe42c..fadeed21e 100644 --- a/Source/Plugins/EditorModules/ObjectInspector/ObjectInspector.Editor.csproj +++ b/Source/Plugins/EditorModules/ObjectInspector/ObjectInspector.Editor.csproj @@ -1,74 +1,76 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.ObjectInspector - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.ObjectInspector + true + true + true + - - - 2.8.2 - - - 1.1.17 - - + + + 2.8.2 + + + 1.1.17 + + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - ResXFileCodeGenerator - ObjectInspectorRes.Designer.cs - Designer - - - True - ObjectInspectorRes.resx - True - - + + ResXFileCodeGenerator + ObjectInspectorRes.Designer.cs + Designer + + + True + ObjectInspectorRes.resx + True + + - - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/Source/Plugins/EditorModules/ProjectView/ProjectView.Editor.csproj b/Source/Plugins/EditorModules/ProjectView/ProjectView.Editor.csproj index ba0cf31d9..664cfb7df 100644 --- a/Source/Plugins/EditorModules/ProjectView/ProjectView.Editor.csproj +++ b/Source/Plugins/EditorModules/ProjectView/ProjectView.Editor.csproj @@ -1,88 +1,90 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.ProjectView - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.ProjectView + true + true + true + - - - 2.8.2 - - - 1.7.7 - - - 1.1.17 - - + + + 2.8.2 + + + 1.7.7 + + + 1.1.17 + + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - ResXFileCodeGenerator - ProjectFolderView.Designer.cs - Designer - - - True - ProjectFolderView.resx - True - + + ResXFileCodeGenerator + ProjectFolderView.Designer.cs + Designer + + + True + ProjectFolderView.resx + True + - - ResXFileCodeGenerator - ProjectViewRes.Designer.cs - Designer - - - True - ProjectViewRes.resx - True - - + + ResXFileCodeGenerator + ProjectViewRes.Designer.cs + Designer + + + True + ProjectViewRes.resx + True + + - - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/Source/Plugins/EditorModules/SceneView/SceneView.Editor.csproj b/Source/Plugins/EditorModules/SceneView/SceneView.Editor.csproj index 6733c3cb0..9a658487c 100644 --- a/Source/Plugins/EditorModules/SceneView/SceneView.Editor.csproj +++ b/Source/Plugins/EditorModules/SceneView/SceneView.Editor.csproj @@ -1,28 +1,29 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.SceneView - true - true - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.SceneView + true + true + true + - - - 2.8.2 - - - 1.7.7 - - - 1.1.17 - - + + + 2.8.2 + + + 1.7.7 + + + 1.1.17 + + - + {9FB9F397-FD39-460C-A9AD-B4780D19945F} DualityEditor @@ -38,41 +39,42 @@ Duality False - + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - ResXFileCodeGenerator - SceneViewRes.Designer.cs - Designer - - - True - SceneViewRes.resx - True - - - + + ResXFileCodeGenerator + SceneViewRes.Designer.cs + Designer + + + True + SceneViewRes.resx + True + - - - + - - - - - + + + + + + + + + \ No newline at end of file diff --git a/Source/Plugins/Tilemaps/Editor/Tilemaps.Editor.csproj b/Source/Plugins/Tilemaps/Editor/Tilemaps.Editor.csproj index 1245598d0..2419ba47e 100644 --- a/Source/Plugins/Tilemaps/Editor/Tilemaps.Editor.csproj +++ b/Source/Plugins/Tilemaps/Editor/Tilemaps.Editor.csproj @@ -1,87 +1,89 @@  - - net472 - true - 4.0.0-alpha3 - Copyright © Duality Core Team 2020 - Duality.Editor.Plugins.Tilemaps - true - true - - - - - 2.8.2 - - - 1.7.7 - - - 1.1.17 - - + + net472 + true + 4.0.0-alpha3 + Copyright © Duality Core Team 2020 + Duality.Editor.Plugins.Tilemaps + true + true + true + - - - {9FB9F397-FD39-460C-A9AD-B4780D19945F} - DualityEditor - False - - - {2f7d1f9d-0803-4e13-85a6-0af56ac05431} - Tilemaps.Core - False - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - False - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - False - - - {e67350ed-2676-492a-9fbe-a08b5fbf3726} - CamView.Editor - False - - + + + 2.8.2 + + + 1.7.7 + + + 1.1.17 + + - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - + + + {9FB9F397-FD39-460C-A9AD-B4780D19945F} + DualityEditor + False + + + {2f7d1f9d-0803-4e13-85a6-0af56ac05431} + Tilemaps.Core + False + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + False + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + False + + + {e67350ed-2676-492a-9fbe-a08b5fbf3726} + CamView.Editor + False + + + - - ResXFileCodeGenerator - TilemapsRes.Designer.cs - Designer - - - True - TilemapsRes.resx - True - - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + - - - + + ResXFileCodeGenerator + TilemapsRes.Designer.cs + Designer + + + True + TilemapsRes.resx + True + + - - - - - + + + + + + + + + \ No newline at end of file diff --git a/Test/Core/DualityTests.csproj b/Test/Core/DualityTests.csproj index d7d8407c3..2ad29ea52 100644 --- a/Test/Core/DualityTests.csproj +++ b/Test/Core/DualityTests.csproj @@ -7,6 +7,7 @@ Copyright © 2013 Duality.Tests false + true diff --git a/Test/Editor/DualityEditorTests.csproj b/Test/Editor/DualityEditorTests.csproj index 1429e2543..1e24929ac 100644 --- a/Test/Editor/DualityEditorTests.csproj +++ b/Test/Editor/DualityEditorTests.csproj @@ -1,51 +1,52 @@  - - net472 - 7.3 - $(RootFolder)Build\Output\ - Copyright © 2013 - Duality.Editor.Tests - false - + + net472 + 7.3 + $(RootFolder)Build\Output\ + Copyright © 2013 + Duality.Editor.Tests + false + true + - - - {9fb9f397-fd39-460c-a9ad-b4780d19945f} - DualityEditor - - - {c87a6a2f-e537-48fa-a789-3c54cf29cc09} - DualityPrimitives - - - {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} - Duality - - + + + {9fb9f397-fd39-460c-a9ad-b4780d19945f} + DualityEditor + + + {c87a6a2f-e537-48fa-a789-3c54cf29cc09} + DualityPrimitives + + + {D821AFB9-BCC9-4025-9A9C-798E2BC546AB} + Duality + + - - - 2.1.1 - - - 3.11.0 - - - 3.10.0 - - - 3.6.0 - - - 3.13.0 - - - - - + + + 2.1.1 + + + 3.11.0 + + + 3.10.0 + + + 3.6.0 + + + 3.13.0 + + + + + - - - + + +