From 27713d72b909c502f83c7f3197349bdad736da2e Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Thu, 30 Sep 2021 15:38:11 +0100 Subject: [PATCH 1/4] Upgrade to .Net Standard 2.0 --- Adapter_Engine/Adapter_Engine.csproj | 119 ++++----------- Adapter_Engine/Properties/AssemblyInfo.cs | 59 -------- Adapter_oM/Adapter_oM.csproj | 102 +++---------- Adapter_oM/Properties/AssemblyInfo.cs | 59 -------- BHoM_Adapter.sln | 46 +++--- BHoM_Adapter/BHoM_Adapter.csproj | 142 +++++------------- BHoM_Adapter/BHoM_Adapter.nuspec | 16 -- BHoM_Adapter/Properties/AssemblyInfo.cs | 59 -------- .../Properties/AssemblyInfo.cs | 59 -------- .../Structure_AdapterModules.csproj | 121 ++++----------- 10 files changed, 139 insertions(+), 643 deletions(-) delete mode 100644 Adapter_Engine/Properties/AssemblyInfo.cs delete mode 100644 Adapter_oM/Properties/AssemblyInfo.cs delete mode 100644 BHoM_Adapter/BHoM_Adapter.nuspec delete mode 100644 BHoM_Adapter/Properties/AssemblyInfo.cs delete mode 100644 Structure_AdapterModules/Properties/AssemblyInfo.cs diff --git a/Adapter_Engine/Adapter_Engine.csproj b/Adapter_Engine/Adapter_Engine.csproj index 8a25dc1d..32372783 100644 --- a/Adapter_Engine/Adapter_Engine.csproj +++ b/Adapter_Engine/Adapter_Engine.csproj @@ -1,117 +1,58 @@ - - - + + - Debug - AnyCPU - {78EACCE7-71DF-4003-BF38-71F80D3F6308} - Library - Properties - BH.Engine.Adapter - Adapter_Engine - v4.5.2 - 512 - true + netstandard2.0 + 5.0.0 + BHoM + Copyright © https://github.com/BHoM - - true - full - false + + ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Build\ - TRACE - prompt - 4 + + + + + + + + + - C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Analytical_oM.dll - C:\ProgramData\BHoM\Assemblies\BHoM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll - False - C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - C:\ProgramData\BHoM\Assemblies\Data_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_Engine.dll - C:\ProgramData\BHoM\Assemblies\Data_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll - C:\ProgramData\BHoM\Assemblies\Diffing_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_Engine.dll - C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll - C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_oM.dll - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False - C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_oM.dll - C:\ProgramData\BHoM\Assemblies\Structure_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Structure_oM.dll - - - - - - - - - - - - - - - - - - - - - - - - - - {03CD2C55-F3A7-4C47-B2E8-64909964329D} - Adapter_oM - False - - - - - -xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - - \ No newline at end of file + + diff --git a/Adapter_Engine/Properties/AssemblyInfo.cs b/Adapter_Engine/Properties/AssemblyInfo.cs deleted file mode 100644 index f680caf1..00000000 --- a/Adapter_Engine/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2021, 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("Adapter_Engine")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Adapter_Engine")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[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("78eacce7-71df-4003-bf38-71f80d3f6308")] - -// 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.0.0.0")] - diff --git a/Adapter_oM/Adapter_oM.csproj b/Adapter_oM/Adapter_oM.csproj index a9b8c8ce..07e6740a 100644 --- a/Adapter_oM/Adapter_oM.csproj +++ b/Adapter_oM/Adapter_oM.csproj @@ -1,98 +1,36 @@ - - - + + - Debug - AnyCPU - {03CD2C55-F3A7-4C47-B2E8-64909964329D} - Library - Properties - BH.oM.Adapter - Adapter_oM - v4.5.2 - 512 - true + netstandard2.0 + 5.0.0 + BHoM + Copyright © https://github.com/BHoM - - true - full - false + + ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Build\ - TRACE - prompt - 4 + + + + + - C:\ProgramData\BHoM\Assemblies\BHoM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll - False - C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - False - C:\ProgramData\BHoM\Assemblies\Data_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll - False - C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll - False - C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_oM.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - - \ No newline at end of file + + diff --git a/Adapter_oM/Properties/AssemblyInfo.cs b/Adapter_oM/Properties/AssemblyInfo.cs deleted file mode 100644 index 9f280cb7..00000000 --- a/Adapter_oM/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2021, 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("Adapter_oM")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Adapter_oM")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[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("03cd2c55-f3a7-4c47-b2e8-64909964329d")] - -// 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.0.0.0")] - diff --git a/BHoM_Adapter.sln b/BHoM_Adapter.sln index dffbc627..3df90704 100644 --- a/BHoM_Adapter.sln +++ b/BHoM_Adapter.sln @@ -1,15 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.852 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHoM_Adapter", "BHoM_Adapter\BHoM_Adapter.csproj", "{C99A5DDF-78B1-4224-81AC-C5B90D03E423}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BHoM_Adapter", "BHoM_Adapter\BHoM_Adapter.csproj", "{41FE6552-45DE-4B79-A11E-B2724077EFFF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Adapter_Engine", "Adapter_Engine\Adapter_Engine.csproj", "{78EACCE7-71DF-4003-BF38-71F80D3F6308}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Adapter_Engine", "Adapter_Engine\Adapter_Engine.csproj", "{06E1FCF3-B637-4902-80B9-7176EBFAD757}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Adapter_oM", "Adapter_oM\Adapter_oM.csproj", "{03CD2C55-F3A7-4C47-B2E8-64909964329D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Adapter_oM", "Adapter_oM\Adapter_oM.csproj", "{59752259-D2F6-46DE-A203-027F6FA1C1EA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Structure_AdapterModules", "Structure_AdapterModules\Structure_AdapterModules.csproj", "{41A21E37-829A-4B8A-A29A-F48787E2B68E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Structure_AdapterModules", "Structure_AdapterModules\Structure_AdapterModules.csproj", "{48BE209E-658F-48FE-B45B-BB4D7E6CDD03}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,27 +17,27 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C99A5DDF-78B1-4224-81AC-C5B90D03E423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C99A5DDF-78B1-4224-81AC-C5B90D03E423}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C99A5DDF-78B1-4224-81AC-C5B90D03E423}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C99A5DDF-78B1-4224-81AC-C5B90D03E423}.Release|Any CPU.Build.0 = Release|Any CPU - {78EACCE7-71DF-4003-BF38-71F80D3F6308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78EACCE7-71DF-4003-BF38-71F80D3F6308}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78EACCE7-71DF-4003-BF38-71F80D3F6308}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78EACCE7-71DF-4003-BF38-71F80D3F6308}.Release|Any CPU.Build.0 = Release|Any CPU - {03CD2C55-F3A7-4C47-B2E8-64909964329D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03CD2C55-F3A7-4C47-B2E8-64909964329D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03CD2C55-F3A7-4C47-B2E8-64909964329D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03CD2C55-F3A7-4C47-B2E8-64909964329D}.Release|Any CPU.Build.0 = Release|Any CPU - {41A21E37-829A-4B8A-A29A-F48787E2B68E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41A21E37-829A-4B8A-A29A-F48787E2B68E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41A21E37-829A-4B8A-A29A-F48787E2B68E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41A21E37-829A-4B8A-A29A-F48787E2B68E}.Release|Any CPU.Build.0 = Release|Any CPU + {41FE6552-45DE-4B79-A11E-B2724077EFFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {41FE6552-45DE-4B79-A11E-B2724077EFFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41FE6552-45DE-4B79-A11E-B2724077EFFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {41FE6552-45DE-4B79-A11E-B2724077EFFF}.Release|Any CPU.Build.0 = Release|Any CPU + {06E1FCF3-B637-4902-80B9-7176EBFAD757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06E1FCF3-B637-4902-80B9-7176EBFAD757}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06E1FCF3-B637-4902-80B9-7176EBFAD757}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06E1FCF3-B637-4902-80B9-7176EBFAD757}.Release|Any CPU.Build.0 = Release|Any CPU + {59752259-D2F6-46DE-A203-027F6FA1C1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59752259-D2F6-46DE-A203-027F6FA1C1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59752259-D2F6-46DE-A203-027F6FA1C1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {59752259-D2F6-46DE-A203-027F6FA1C1EA}.Release|Any CPU.Build.0 = Release|Any CPU + {48BE209E-658F-48FE-B45B-BB4D7E6CDD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48BE209E-658F-48FE-B45B-BB4D7E6CDD03}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48BE209E-658F-48FE-B45B-BB4D7E6CDD03}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48BE209E-658F-48FE-B45B-BB4D7E6CDD03}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9F3C73B6-F4F5-4126-B74C-7B4A2F83F793} + SolutionGuid = {8A5D489E-85C1-4650-8792-5663300BCED6} EndGlobalSection EndGlobal diff --git a/BHoM_Adapter/BHoM_Adapter.csproj b/BHoM_Adapter/BHoM_Adapter.csproj index c5f5d459..6d1d80a5 100644 --- a/BHoM_Adapter/BHoM_Adapter.csproj +++ b/BHoM_Adapter/BHoM_Adapter.csproj @@ -1,134 +1,60 @@ - - - + + - Debug - AnyCPU - {C99A5DDF-78B1-4224-81AC-C5B90D03E423} - Library - Properties - BH.Adapter - BHoM_Adapter - v4.5.2 - 512 + netstandard2.0 + 5.0.0 + BHoM + Copyright © https://github.com/BHoM - - true - full - false + + ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Build\ - TRACE - prompt - 4 + + + + + + + + + + + + + + - C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Analytical_oM.dll - False - 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\Data_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_Engine.dll - C:\ProgramData\BHoM\Assemblies\Data_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll - C:\ProgramData\BHoM\Assemblies\Diffing_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_Engine.dll - C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll - C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_oM.dll - False - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_oM.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {78eacce7-71df-4003-bf38-71f80d3f6308} - Adapter_Engine - False - - - {03cd2c55-f3a7-4c47-b2e8-64909964329d} - Adapter_oM - False - - - - - - -xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - - - \ No newline at end of file + + diff --git a/BHoM_Adapter/BHoM_Adapter.nuspec b/BHoM_Adapter/BHoM_Adapter.nuspec deleted file mode 100644 index 45f5580a..00000000 --- a/BHoM_Adapter/BHoM_Adapter.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - BH.Adapter - $version$ - $title$ - $author$ - $author$ - https://github.com/BuroHappoldEngineering/BHoM_Adapter/blob/master/LICENSE - https://github.com/BuroHappoldEngineering/BHoM_Adapter - false - $description$ - $copyright$ - BHoM Adapter - - diff --git a/BHoM_Adapter/Properties/AssemblyInfo.cs b/BHoM_Adapter/Properties/AssemblyInfo.cs deleted file mode 100644 index 0f0ee339..00000000 --- a/BHoM_Adapter/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2021, 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.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("BH.Adapter")] -[assembly: AssemblyDescription("BHoM Adapter")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BH.Adapter")] -[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("c99a5ddf-78b1-4224-81ac-c5b90d03e423")] - -// 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.0.0.0")] - - diff --git a/Structure_AdapterModules/Properties/AssemblyInfo.cs b/Structure_AdapterModules/Properties/AssemblyInfo.cs deleted file mode 100644 index 6652e50e..00000000 --- a/Structure_AdapterModules/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2021, 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("StructuralAnalysisAdapter")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("StructuralAnalysisAdapter")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[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("41a21e37-829a-4b8a-a29a-f48787e2b68e")] - -// 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.0.0.0")] - diff --git a/Structure_AdapterModules/Structure_AdapterModules.csproj b/Structure_AdapterModules/Structure_AdapterModules.csproj index eba14f8d..747ab977 100644 --- a/Structure_AdapterModules/Structure_AdapterModules.csproj +++ b/Structure_AdapterModules/Structure_AdapterModules.csproj @@ -1,115 +1,58 @@ - - - + + - Debug - AnyCPU - {41A21E37-829A-4B8A-A29A-F48787E2B68E} - Library - Properties - BH.Adapter.Modules.Structure - Structure_AdapterModules - v4.5.2 - 512 - true + netstandard2.0 + 5.0.0 + BHoM + Copyright © https://github.com/BHoM - - true - full - false + + + Off ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Build\ - TRACE - prompt - 4 + + + + + + + + + + + - False - C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Analytical_oM.dll - 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\Data_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll - C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll - C:\ProgramData\BHoM\Assemblies\Dimensional_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Dimensional_oM.dll - C:\ProgramData\BHoM\Assemblies\Geometry_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_Engine.dll - False - C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_oM.dll - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - C:\ProgramData\BHoM\Assemblies\Structure_oM.dll - False + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Structure_oM.dll - - - - - - - - - - - - - - - - - - {78eacce7-71df-4003-bf38-71f80d3f6308} - Adapter_Engine - False - - - {03cd2c55-f3a7-4c47-b2e8-64909964329d} - Adapter_oM - False - - - {c99a5ddf-78b1-4224-81ac-c5b90d03e423} - BHoM_Adapter - False - - - - - -xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - - \ No newline at end of file + + From 47d695dfb38e6e3ff6d159cf2cf127faa8592fad Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Thu, 30 Sep 2021 15:38:34 +0100 Subject: [PATCH 2/4] Force commit to fix enum folder name --- Adapter_oM/{enums => Enums2}/PullType.cs | 0 Adapter_oM/{enums => Enums2}/PushType.cs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Adapter_oM/{enums => Enums2}/PullType.cs (100%) rename Adapter_oM/{enums => Enums2}/PushType.cs (100%) diff --git a/Adapter_oM/enums/PullType.cs b/Adapter_oM/Enums2/PullType.cs similarity index 100% rename from Adapter_oM/enums/PullType.cs rename to Adapter_oM/Enums2/PullType.cs diff --git a/Adapter_oM/enums/PushType.cs b/Adapter_oM/Enums2/PushType.cs similarity index 100% rename from Adapter_oM/enums/PushType.cs rename to Adapter_oM/Enums2/PushType.cs From f4e2a8c25f6004f38c8c0bdefaaccd676d2aadf5 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Thu, 30 Sep 2021 15:38:57 +0100 Subject: [PATCH 3/4] Force commit to fix Enum folder name to be with capital E --- Adapter_oM/{Enums2 => Enums}/PullType.cs | 0 Adapter_oM/{Enums2 => Enums}/PushType.cs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Adapter_oM/{Enums2 => Enums}/PullType.cs (100%) rename Adapter_oM/{Enums2 => Enums}/PushType.cs (100%) diff --git a/Adapter_oM/Enums2/PullType.cs b/Adapter_oM/Enums/PullType.cs similarity index 100% rename from Adapter_oM/Enums2/PullType.cs rename to Adapter_oM/Enums/PullType.cs diff --git a/Adapter_oM/Enums2/PushType.cs b/Adapter_oM/Enums/PushType.cs similarity index 100% rename from Adapter_oM/Enums2/PushType.cs rename to Adapter_oM/Enums/PushType.cs From 4e5752f1d8868b708d1bc004dd92881fc293aab1 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Thu, 30 Sep 2021 17:50:49 +0100 Subject: [PATCH 4/4] Fix ref paths --- Adapter_Engine/Adapter_Engine.csproj | 22 +++++++++---------- Adapter_oM/Adapter_oM.csproj | 10 ++++----- BHoM_Adapter/BHoM_Adapter.csproj | 20 ++++++++--------- .../Structure_AdapterModules.csproj | 20 ++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Adapter_Engine/Adapter_Engine.csproj b/Adapter_Engine/Adapter_Engine.csproj index 32372783..e1436008 100644 --- a/Adapter_Engine/Adapter_Engine.csproj +++ b/Adapter_Engine/Adapter_Engine.csproj @@ -21,37 +21,37 @@ - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Analytical_oM.dll + C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + C:\ProgramData\BHoM\Assemblies\BHoM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_Engine.dll + C:\ProgramData\BHoM\Assemblies\Data_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll + C:\ProgramData\BHoM\Assemblies\Data_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_Engine.dll + C:\ProgramData\BHoM\Assemblies\Diffing_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll + C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_oM.dll + C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_oM.dll + C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Structure_oM.dll + C:\ProgramData\BHoM\Assemblies\Structure_oM.dll diff --git a/Adapter_oM/Adapter_oM.csproj b/Adapter_oM/Adapter_oM.csproj index 07e6740a..d54e7c9c 100644 --- a/Adapter_oM/Adapter_oM.csproj +++ b/Adapter_oM/Adapter_oM.csproj @@ -17,19 +17,19 @@ - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + C:\ProgramData\BHoM\Assemblies\BHoM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll + C:\ProgramData\BHoM\Assemblies\Data_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll + C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_oM.dll + C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll diff --git a/BHoM_Adapter/BHoM_Adapter.csproj b/BHoM_Adapter/BHoM_Adapter.csproj index 6d1d80a5..a5e7c600 100644 --- a/BHoM_Adapter/BHoM_Adapter.csproj +++ b/BHoM_Adapter/BHoM_Adapter.csproj @@ -26,34 +26,34 @@ - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Analytical_oM.dll + C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + C:\ProgramData\BHoM\Assemblies\BHoM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_Engine.dll + C:\ProgramData\BHoM\Assemblies\Data_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll + C:\ProgramData\BHoM\Assemblies\Data_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_Engine.dll + C:\ProgramData\BHoM\Assemblies\Diffing_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll + C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_oM.dll + C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_oM.dll + C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll diff --git a/Structure_AdapterModules/Structure_AdapterModules.csproj b/Structure_AdapterModules/Structure_AdapterModules.csproj index 747ab977..1dd871d4 100644 --- a/Structure_AdapterModules/Structure_AdapterModules.csproj +++ b/Structure_AdapterModules/Structure_AdapterModules.csproj @@ -24,34 +24,34 @@ - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Analytical_oM.dll + C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + C:\ProgramData\BHoM\Assemblies\BHoM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll + C:\ProgramData\BHoM\Assemblies\Data_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Diffing_oM.dll + C:\ProgramData\BHoM\Assemblies\Diffing_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Dimensional_oM.dll + C:\ProgramData\BHoM\Assemblies\Dimensional_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_Engine.dll + C:\ProgramData\BHoM\Assemblies\Geometry_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Geometry_oM.dll + C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Structure_oM.dll + C:\ProgramData\BHoM\Assemblies\Structure_oM.dll