From 6657741c311b1e1444f87c9ccc4bc731c4c1e01d Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Tue, 19 Apr 2022 14:10:09 +0100 Subject: [PATCH 1/2] Update CI Code to new csproject format --- .ci/code/Engine_Test/Engine_Test.csproj | 80 +++++------------- .../Engine_Test/Properties/AssemblyInfo.cs | 58 ------------- .../Properties/AssemblyInfo.cs | 59 -------------- .../Serialiser_Test/Serialiser_Test.csproj | 81 +++++-------------- .ci/code/Verification.sln | 24 +++--- 5 files changed, 51 insertions(+), 251 deletions(-) delete mode 100644 .ci/code/Engine_Test/Properties/AssemblyInfo.cs delete mode 100644 .ci/code/Serialiser_Test/Properties/AssemblyInfo.cs diff --git a/.ci/code/Engine_Test/Engine_Test.csproj b/.ci/code/Engine_Test/Engine_Test.csproj index c7721ef85..eb57e4135 100644 --- a/.ci/code/Engine_Test/Engine_Test.csproj +++ b/.ci/code/Engine_Test/Engine_Test.csproj @@ -1,73 +1,35 @@ - - - + + - Debug - AnyCPU - {216E8DF8-9650-4B3B-8416-959B94BC527C} - Library - Properties - BH.Test.Engine - Engine_Test - v4.7.2 - 512 - true - - - true - full - false - ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netstandard2.0 + 5.0.0.0 + 5.2.0.0 + + + + + - C:\ProgramData\BHoM\Assemblies\BHoM.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll - C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - - - - - - - - - C:\ProgramData\BHoM\Assemblies\Test_Engine.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_Engine.dll - C:\ProgramData\BHoM\Assemblies\Test_oM.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_oM.dll - - - - - - - - - - xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - \ No newline at end of file + + + + + + diff --git a/.ci/code/Engine_Test/Properties/AssemblyInfo.cs b/.ci/code/Engine_Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 49c7f4f52..000000000 --- a/.ci/code/Engine_Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. - * - * Each contributor holds copyright over their respective contributions. - * The project versioning (Git) records all such contribution source information. - * - * - * The BHoM is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3.0 of the License, or - * (at your option) any later version. - * - * The BHoM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this code. If not, see . - */ - -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("Engine_Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Engine_Test")] -[assembly: AssemblyCopyright("Copyright © https://github.com/BHoM")] -[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("216e8df8-9650-4b3b-8416-959b94bc527c")] - -// 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("5.0.0.0")] -[assembly: AssemblyFileVersion("5.2.0.0")] diff --git a/.ci/code/Serialiser_Test/Properties/AssemblyInfo.cs b/.ci/code/Serialiser_Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 399105d50..000000000 --- a/.ci/code/Serialiser_Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. - * - * Each contributor holds copyright over their respective contributions. - * The project versioning (Git) records all such contribution source information. - * - * - * The BHoM is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3.0 of the License, or - * (at your option) any later version. - * - * The BHoM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this code. If not, see . - */ - -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("Serialiser_Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Serialiser_Test")] -[assembly: AssemblyCopyright("Copyright © https://github.com/BHoM")] -[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("92f35a76-1a04-4194-9249-d459460de328")] - -// 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("5.0.0.0")] -[assembly: AssemblyFileVersion("5.2.0.0")] - diff --git a/.ci/code/Serialiser_Test/Serialiser_Test.csproj b/.ci/code/Serialiser_Test/Serialiser_Test.csproj index 8a3e417a3..f27a50c22 100644 --- a/.ci/code/Serialiser_Test/Serialiser_Test.csproj +++ b/.ci/code/Serialiser_Test/Serialiser_Test.csproj @@ -1,79 +1,34 @@ - - - + + - Debug - AnyCPU - {92F35A76-1A04-4194-9249-D459460DE328} - Library - Properties - BH.Test.Serialiser - Serialiser_Test - v4.7.2 - 512 - true - - - true - full - false - ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netstandard2.0 + 5.0.0.0 + 5.2.0.0 + + + + + - C:\ProgramData\BHoM\Assemblies\BHoM.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll - C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll - - - - - - - - - C:\ProgramData\BHoM\Assemblies\Test_Engine.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_Engine.dll - C:\ProgramData\BHoM\Assemblies\Test_oM.dll - False + ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_oM.dll - - - - - - - - - - - xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - \ No newline at end of file + + diff --git a/.ci/code/Verification.sln b/.ci/code/Verification.sln index 0e651823a..624ddc602 100644 --- a/.ci/code/Verification.sln +++ b/.ci/code/Verification.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1259 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serialiser_Test", "Serialiser_Test\Serialiser_Test.csproj", "{92F35A76-1A04-4194-9249-D459460DE328}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine_Test", "Engine_Test\Engine_Test.csproj", "{A02B86C5-9877-4618-88EA-0A308CA52F2B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine_Test", "Engine_Test\Engine_Test.csproj", "{216E8DF8-9650-4B3B-8416-959B94BC527C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serialiser_Test", "Serialiser_Test\Serialiser_Test.csproj", "{A10A1851-18CE-4D93-90F9-1FAB2ECE048F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {92F35A76-1A04-4194-9249-D459460DE328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92F35A76-1A04-4194-9249-D459460DE328}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92F35A76-1A04-4194-9249-D459460DE328}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92F35A76-1A04-4194-9249-D459460DE328}.Release|Any CPU.Build.0 = Release|Any CPU - {216E8DF8-9650-4B3B-8416-959B94BC527C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {216E8DF8-9650-4B3B-8416-959B94BC527C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {216E8DF8-9650-4B3B-8416-959B94BC527C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {216E8DF8-9650-4B3B-8416-959B94BC527C}.Release|Any CPU.Build.0 = Release|Any CPU + {A02B86C5-9877-4618-88EA-0A308CA52F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A02B86C5-9877-4618-88EA-0A308CA52F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A02B86C5-9877-4618-88EA-0A308CA52F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A02B86C5-9877-4618-88EA-0A308CA52F2B}.Release|Any CPU.Build.0 = Release|Any CPU + {A10A1851-18CE-4D93-90F9-1FAB2ECE048F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A10A1851-18CE-4D93-90F9-1FAB2ECE048F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A10A1851-18CE-4D93-90F9-1FAB2ECE048F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A10A1851-18CE-4D93-90F9-1FAB2ECE048F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From ef16d075966ca9385bdfb64af1c73228554b9c56 Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Tue, 19 Apr 2022 14:13:02 +0100 Subject: [PATCH 2/2] Update CSProject compliance --- .ci/code/Engine_Test/Engine_Test.csproj | 20 ++++++++++++---- .../Serialiser_Test/Serialiser_Test.csproj | 24 ++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.ci/code/Engine_Test/Engine_Test.csproj b/.ci/code/Engine_Test/Engine_Test.csproj index eb57e4135..21ffef00e 100644 --- a/.ci/code/Engine_Test/Engine_Test.csproj +++ b/.ci/code/Engine_Test/Engine_Test.csproj @@ -12,19 +12,29 @@ - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + C:\ProgramData\BHoM\Assemblies\BHoM.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_Engine.dll + C:\ProgramData\BHoM\Assemblies\Test_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_oM.dll + C:\ProgramData\BHoM\Assemblies\Test_oM.dll + False + False diff --git a/.ci/code/Serialiser_Test/Serialiser_Test.csproj b/.ci/code/Serialiser_Test/Serialiser_Test.csproj index f27a50c22..4cb1982f0 100644 --- a/.ci/code/Serialiser_Test/Serialiser_Test.csproj +++ b/.ci/code/Serialiser_Test/Serialiser_Test.csproj @@ -12,22 +12,34 @@ - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + C:\ProgramData\BHoM\Assemblies\BHoM.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll + C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_Engine.dll + C:\ProgramData\BHoM\Assemblies\Test_Engine.dll + False + False - ..\..\..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Test_oM.dll + C:\ProgramData\BHoM\Assemblies\Test_oM.dll + False + False