From 996b45a04f168eda22a89973d1678d0ca8cb04bf Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 28 May 2019 00:18:29 +0200 Subject: [PATCH] Project File Refactor (#241) * Project file refactor, content edition * Update submodule --- Content.Client/Content.Client.csproj | 174 ++------------ Content.Client/Properties/AssemblyInfo.cs | 36 --- .../Content.IntegrationTests.csproj | 49 ++-- Content.Server/Content.Server.csproj | 221 ++---------------- Content.Server/Properties/AssemblyInfo.cs | 36 --- Content.Shared/Content.Shared.csproj | 138 ++--------- Content.Shared/Properties/AssemblyInfo.cs | 36 --- Content.Shared/Research/RecipePrototype.cs | 65 ------ Content.Tests/Content.Tests.csproj | 125 ++-------- Content.Tests/Properties/AssemblyInfo.cs | 33 --- RobustToolbox | 2 +- SS14.Content.targets | 11 - SpaceStation14.sln | 130 ++++------- Tools/package_release_build.py | 9 +- 14 files changed, 130 insertions(+), 935 deletions(-) delete mode 100644 Content.Client/Properties/AssemblyInfo.cs delete mode 100644 Content.Server/Properties/AssemblyInfo.cs delete mode 100644 Content.Shared/Properties/AssemblyInfo.cs delete mode 100644 Content.Shared/Research/RecipePrototype.cs delete mode 100644 Content.Tests/Properties/AssemblyInfo.cs delete mode 100644 SS14.Content.targets diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index d7632f5255..e75fa1402b 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -1,57 +1,14 @@ - - - + + - Debug - x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED} - Library - Properties - Content.Client - Content.Client - v4.7.2 - 512 - ..\RobustToolbox\bin\Client\Resources\Assemblies\ - 7.2 - + net472 + 7.3 + false + x64;x86 + false ..\bin\Content.Client\ - prompt - MinimumRecommendedRules.ruleset - - - true - DEBUG;TRACE - portable - x86 - - - TRACE;RELEASE - true - x86 - - - true - DEBUG;TRACE - portable - x64 - - - TRACE;RELEASE - true - x64 - - - TRACE;RELEASE - true - - - true - DEBUG;TRACE - portable + @@ -61,113 +18,10 @@ - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {26aeebb3-dde7-443a-9f43-7bc7f4acf6b5} - Content.Shared - - - {83429bd6-6358-4b18-be51-401df8ea2673} - Robust.Client - - - {93f23a82-00c5-4572-964e-e7c9457726d4} - Robust.Shared.Maths - - - {0529f740-0000-0000-0000-000000000000} - Robust.Shared - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/Content.Client/Properties/AssemblyInfo.cs b/Content.Client/Properties/AssemblyInfo.cs deleted file mode 100644 index 95ab318881..0000000000 --- a/Content.Client/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Content.Client")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Content.Client")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a2e5f175-78af-4ddd-8f97-e2d2552372ed")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj index 5e7011bffb..58a90acb2a 100644 --- a/Content.IntegrationTests/Content.IntegrationTests.csproj +++ b/Content.IntegrationTests/Content.IntegrationTests.csproj @@ -1,28 +1,25 @@  - - - net472 - ..\bin\Content.IntegrationTests\ - false - AnyCPU;x64 - - - - - - - - - - - - - - - - - - - - + + net472 + ..\bin\Content.IntegrationTests\ + false + false + x86;x64 + + + + + + + + + + + + + + + + + diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index 8495a115da..d133cab55c 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -1,215 +1,26 @@ - - - + + - Debug - x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A} - Library - Properties - Content.Server - Content.Server - v4.7.2 - 512 - ..\RobustToolbox\bin\Server\Resources\Assemblies\ + net472 + 7.3 + false + x64;x86 + false ..\bin\Content.Server\ - prompt - 7.2 - MinimumRecommendedRules.ruleset - - - true - DEBUG;TRACE - portable - x86 - - - TRACE;RELEASE - true - x86 - - - true - DEBUG;TRACE - portable - x64 - - - TRACE;RELEASE - true - x64 - - - TRACE;RELEASE - true - - - true - DEBUG;TRACE - portable + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {26aeebb3-dde7-443a-9f43-7bc7f4acf6b5} - Content.Shared - - - {b04aae71-0000-0000-0000-000000000000} - Robust.Server - - - {93f23a82-00c5-4572-964e-e7c9457726d4} - Robust.Shared.Maths - - - {0529f740-0000-0000-0000-000000000000} - Robust.Shared - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/Content.Server/Properties/AssemblyInfo.cs b/Content.Server/Properties/AssemblyInfo.cs deleted file mode 100644 index 3ef457b5b3..0000000000 --- a/Content.Server/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Content.Server")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Content.Server")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b38dbbd0-04c2-4d1a-84e2-b3446f6adf2a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index d0d433d44f..f501268aeb 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -1,133 +1,21 @@ - - - + + - Debug - x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} - Library - Properties - Content.Shared - Content.Shared - v4.7.2 - 512 - bin\x86\Debug\ - prompt - 7.2 - MinimumRecommendedRules.ruleset - - - true - DEBUG;TRACE - portable - x86 - - - TRACE;RELEASE - true - x86 - - - true - DEBUG;TRACE - portable - x64 - - - TRACE;RELEASE - true - x64 - - - TRACE;RELEASE - true - - - true - DEBUG;TRACE - portable + net472 + 7.3 + false + x64;x86 + false + ../bin/Content.Shared + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {D63D377C-242B-4FC5-8337-35CB87E6C537} - Lidgren.Network - - - {93f23a82-00c5-4572-964e-e7c9457726d4} - Robust.Shared.Maths - - - {0529f740-0000-0000-0000-000000000000} - Robust.Shared - - - - - \ No newline at end of file + diff --git a/Content.Shared/Properties/AssemblyInfo.cs b/Content.Shared/Properties/AssemblyInfo.cs deleted file mode 100644 index 3a19876aef..0000000000 --- a/Content.Shared/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Content.Shared")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Content.Shared")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("26aeebb3-dde7-443a-9f43-7bc7f4acf6b5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Content.Shared/Research/RecipePrototype.cs b/Content.Shared/Research/RecipePrototype.cs deleted file mode 100644 index c0cabf2a3a..0000000000 --- a/Content.Shared/Research/RecipePrototype.cs +++ /dev/null @@ -1,65 +0,0 @@ -using SS14.Shared.Prototypes; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; -using YamlDotNet.RepresentationModel; - -namespace Content.Shared.Research -{ - [Prototype("latheRecipe")] - public class LatheRecipePrototype : IPrototype, IIndexedPrototype - { - private string _name; - private string _id; - private SpriteSpecifier _icon; - private string _description; - private string _result; - private bool _hacked; - private string _latheType; - - public string ID => _id; - - /// - /// Name displayed in the lathe GUI. - /// - public string Name => _name; - - /// - /// Short description displayed in the lathe GUI. - /// - public string Description => _description; - - /// - /// Texture path used in the lathe GUI. - /// - public SpriteSpecifier Icon => _icon; - - /// - /// The prototype name of the resulting entity when the recipe is printed. - /// - public string Result => _result; - - /// - /// Whether the lathe should be hacked to unlock this recipe. - /// - public bool Hacked => _hacked; - - /// - /// The type of lathe that'll print this recipe. - /// TODO: Replace with an enum before merging, henk! - /// - public string LatheType => _latheType; - - public void LoadFrom(YamlMappingNode mapping) - { - var serializer = YamlObjectSerializer.NewReader(mapping); - _name = serializer.ReadDataField("name"); - - serializer.DataField(ref _id, "id", string.Empty); - serializer.DataField(ref _description, "description", string.Empty); - serializer.DataField(ref _icon, "icon", SpriteSpecifier.Invalid); - serializer.DataField(ref _result, "result", null); - serializer.DataField(ref _hacked, "hacked", false); - serializer.DataField(ref _latheType, "lathetype", "default"); - } - } -} diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj index 81dd901b74..ec1e0a6440 100644 --- a/Content.Tests/Content.Tests.csproj +++ b/Content.Tests/Content.Tests.csproj @@ -1,66 +1,14 @@ - - - - - + + - Debug - AnyCPU - {8EDF4429-251A-416D-BB68-93F227191BCF} - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - Content.Tests - Content.Tests - v4.7.2 - 512 - UnitTest + net472 + 7.3 + false + x64;x86 + false ..\bin\Content.Tests\ - 7.2 - - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 - - - true - DEBUG;TRACE - full - x64 - prompt - - - TRACE - true - pdbonly - x64 - prompt - - - true - DEBUG;TRACE - full - x86 - prompt - - - TRACE - true - pdbonly - x86 - prompt + @@ -68,52 +16,13 @@ - + + + + + + + + - - - - - - - {a2e5f175-78af-4ddd-8f97-e2d2552372ed} - Content.Client - - - {b38dbbd0-04c2-4d1a-84e2-b3446f6adf2a} - Content.Server - - - {26aeebb3-dde7-443a-9f43-7bc7f4acf6b5} - Content.Shared - - - {83429bd6-6358-4b18-be51-401df8ea2673} - Robust.Client - - - {b04aae71-0000-0000-0000-000000000000} - Robust.Server - - - {93f23a82-00c5-4572-964e-e7c9457726d4} - Robust.Shared.Maths - - - {0529f740-0000-0000-0000-000000000000} - Robust.Shared - - - {f0ada779-40b8-4f7e-ba6c-cdb19f3065d9} - Robust.UnitTesting - - - - - \ No newline at end of file + diff --git a/Content.Tests/Properties/AssemblyInfo.cs b/Content.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 9b98942957..0000000000 --- a/Content.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Content.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("nunit.tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/RobustToolbox b/RobustToolbox index 110bd0921a..bb4a1eda8e 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 110bd0921afed3ffe245b6555998c52a9b8b461b +Subproject commit bb4a1eda8e0f32224616fe05e30be05ed3800540 diff --git a/SS14.Content.targets b/SS14.Content.targets deleted file mode 100644 index ce9cf1cf13..0000000000 --- a/SS14.Content.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - False - - - diff --git a/SpaceStation14.sln b/SpaceStation14.sln index b09fe854bf..c431f1fdac 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -40,157 +40,107 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.IntegrationTests", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.Build.0 = Debug|x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.Build.0 = Release|x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.Build.0 = Debug|x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.Build.0 = Release|x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.Build.0 = Debug|x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.Build.0 = Release|x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86 - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.Build.0 = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.Build.0 = Debug|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|x86 {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.Build.0 = Debug|x86 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.Build.0 = Release|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|x86 {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.Build.0 = Release|x86 - {59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 - {59250BAF-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 - {59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 - {59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 - {59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 - {59250BAF-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 - {59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 - {59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.ActiveCfg = Debug|x64 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.Build.0 = Debug|x64 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.ActiveCfg = Debug|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.Build.0 = Debug|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.Build.0 = Release|Any CPU - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.ActiveCfg = Release|x64 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.Build.0 = Release|x64 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.ActiveCfg = Release|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.Build.0 = Release|x86 - {B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 - {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 - {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 - {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 - {B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {B04AAE71-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 - {B04AAE71-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 - {B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 - {B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 - {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.ActiveCfg = Debug|x64 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.Build.0 = Debug|x64 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.ActiveCfg = Debug|x86 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.Build.0 = Debug|x86 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.ActiveCfg = Release|x64 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.Build.0 = Release|x64 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.ActiveCfg = Release|x86 + {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.Build.0 = Release|x86 {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x64.ActiveCfg = Debug|x64 {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x64.Build.0 = Debug|x64 {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x86.ActiveCfg = Debug|x86 {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x86.Build.0 = Debug|x86 - {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.Build.0 = Release|Any CPU {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x64.ActiveCfg = Release|x64 {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x64.Build.0 = Release|x64 {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x86.ActiveCfg = Release|x86 {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x86.Build.0 = Release|x86 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.ActiveCfg = Debug|x64 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.Build.0 = Debug|x64 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.Build.0 = Debug|Any CPU - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.ActiveCfg = Debug|x64 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.Build.0 = Debug|x64 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Debug|x86 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Debug|x86 - {0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {0529F740-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 {0529F740-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 {0529F740-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 {0529F740-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 - {0529F740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0529F740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {0529F740-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 {0529F740-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 {0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 {0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.ActiveCfg = Debug|x64 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.Build.0 = Debug|x64 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.ActiveCfg = Debug|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.Build.0 = Debug|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.Build.0 = Release|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.ActiveCfg = Release|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.Build.0 = Release|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.ActiveCfg = Release|Any CPU - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.Build.0 = Release|Any CPU + {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {B04AAE71-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 + {B04AAE71-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 + {B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 + {B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.ActiveCfg = Debug|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.Build.0 = Debug|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.ActiveCfg = Release|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.Build.0 = Release|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.ActiveCfg = Debug|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.Build.0 = Debug|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.ActiveCfg = Release|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.Build.0 = Release|x64 + {59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|Any CPU + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.ActiveCfg = Debug|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.Build.0 = Debug|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.ActiveCfg = Release|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.Build.0 = Release|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Release|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Tools/package_release_build.py b/Tools/package_release_build.py index 3f173d3883..560d8980c0 100755 --- a/Tools/package_release_build.py +++ b/Tools/package_release_build.py @@ -101,7 +101,8 @@ def build_windows(): "/nologo", "/v:m", "/p:TargetOS=Windows", - "/t:Rebuild" + "/t:Rebuild", + "/p:FullRelease=True" ], check=True) print(Fore.GREEN + "Packaging Windows x64 client..." + Style.RESET_ALL) @@ -135,7 +136,8 @@ def build_macos(): "/nologo", "/v:m", "/p:TargetOS=MacOS", - "/t:Rebuild" + "/t:Rebuild", + "/p:FullRelease=True" ], check=True) print(Fore.GREEN + "Packaging macOS x64 client..." + Style.RESET_ALL) @@ -171,7 +173,8 @@ def build_linux(): "/nologo", "/v:m", "/p:TargetOS=Linux", - "/t:Rebuild" + "/t:Rebuild", + "/p:FullRelease=True" ], check=True) print(Fore.GREEN + "Packaging Linux x64 client..." + Style.RESET_ALL)