From fadedd52286da0b9bf96fd976ff964129bfda881 Mon Sep 17 00:00:00 2001 From: Isak Naslund Date: Fri, 29 May 2020 11:54:00 +0200 Subject: [PATCH 1/2] Update namespace --- .../Convert/ToGsa/Loads/LoadCombination.cs | 2 +- GSA_Adapter/GSAAdapter.cs | 2 +- GSA_Engine/Create/GSAConfig.cs | 4 +-- GSA_Engine/GSA_Engine.csproj | 3 +- GSA_Engine/Modify/SetAnalysisType.cs | 4 +-- GSA_Engine/Versioning_32.json | 20 +++++++++++++ GSA_oM/Enum/{TaskType.cs => AnalysisType.cs} | 2 +- GSA_oM/Enum/ConcreteDesignSpecification.cs | 2 +- GSA_oM/Enum/Country.cs | 2 +- GSA_oM/Enum/SteelDesignSpecification.cs | 2 +- GSA_oM/Fragments/AnalysisTaskFragment.cs | 2 +- GSA_oM/GSA_oM.csproj | 7 +++-- GSA_oM/Settings/GSAConfig.cs | 2 +- GSA_oM/Versioning_32.json | 30 +++++++++++++++++++ 14 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 GSA_Engine/Versioning_32.json rename GSA_oM/Enum/{TaskType.cs => AnalysisType.cs} (98%) create mode 100644 GSA_oM/Versioning_32.json diff --git a/GSA_Adapter/Convert/ToGsa/Loads/LoadCombination.cs b/GSA_Adapter/Convert/ToGsa/Loads/LoadCombination.cs index 0076008a..b7068606 100644 --- a/GSA_Adapter/Convert/ToGsa/Loads/LoadCombination.cs +++ b/GSA_Adapter/Convert/ToGsa/Loads/LoadCombination.cs @@ -23,7 +23,7 @@ using BH.oM.Structure.Loads; using System.Collections.Generic; -using BH.oM.External.GSA; +using BH.oM.Adapters.GSA; using BH.Engine.Base; namespace BH.Adapter.GSA diff --git a/GSA_Adapter/GSAAdapter.cs b/GSA_Adapter/GSAAdapter.cs index 046d824e..4c00f24f 100644 --- a/GSA_Adapter/GSAAdapter.cs +++ b/GSA_Adapter/GSAAdapter.cs @@ -21,7 +21,7 @@ */ using Interop.gsa_8_7; -using BH.oM.GSA; +using BH.oM.Adapters.GSA; using System.ComponentModel; using System; using BH.oM.Adapter; diff --git a/GSA_Engine/Create/GSAConfig.cs b/GSA_Engine/Create/GSAConfig.cs index 46d03a18..3d818ff4 100644 --- a/GSA_Engine/Create/GSAConfig.cs +++ b/GSA_Engine/Create/GSAConfig.cs @@ -20,10 +20,10 @@ * along with this code. If not, see . */ -using BH.oM.GSA; +using BH.oM.Adapters.GSA; using BH.oM.Reflection.Attributes; -namespace BH.Engine.GSA +namespace BH.Engine.Adapters.GSA { public static partial class Create { diff --git a/GSA_Engine/GSA_Engine.csproj b/GSA_Engine/GSA_Engine.csproj index 7fea3fc1..8ed25e06 100644 --- a/GSA_Engine/GSA_Engine.csproj +++ b/GSA_Engine/GSA_Engine.csproj @@ -7,7 +7,7 @@ {CA275200-B50F-4B09-BE44-FBB106E3DE42} Library Properties - BH.Engine.GSA + BH.Engine.Adapters.GSA GSA_Engine v4.5.2 512 @@ -126,6 +126,7 @@ + diff --git a/GSA_Engine/Modify/SetAnalysisType.cs b/GSA_Engine/Modify/SetAnalysisType.cs index 19b4c99c..5eeeaf53 100644 --- a/GSA_Engine/Modify/SetAnalysisType.cs +++ b/GSA_Engine/Modify/SetAnalysisType.cs @@ -27,9 +27,9 @@ using BH.oM.Reflection.Attributes; using BH.oM.Base; using BH.oM.Structure.Loads; -using BH.oM.External.GSA; +using BH.oM.Adapters.GSA; -namespace BH.Engine.External.GSA +namespace BH.Engine.Adapters.GSA { public static partial class Modify { diff --git a/GSA_Engine/Versioning_32.json b/GSA_Engine/Versioning_32.json new file mode 100644 index 00000000..71c5fe4b --- /dev/null +++ b/GSA_Engine/Versioning_32.json @@ -0,0 +1,20 @@ +{ + "Namespace": { + "ToNew": { + + }, + "ToOld": { + + } + }, + "Type": { + "ToNew": { + "BH.Engine.External.GSA.Modify": "BH.Engine.Adapters.GSA.Modify" + "BH.Engine.GSA.Create": "BH.Engine.Adapters.GSA.Create" + }, + "ToOld": { + "BH.Engine.Adapters.GSA.Modify": "BH.Engine.External.GSA.Modify" + "BH.Engine.Adapters.GSA.Create": "BH.Engine.GSA.Create" + } + } +} \ No newline at end of file diff --git a/GSA_oM/Enum/TaskType.cs b/GSA_oM/Enum/AnalysisType.cs similarity index 98% rename from GSA_oM/Enum/TaskType.cs rename to GSA_oM/Enum/AnalysisType.cs index c40e7200..3d5e1d55 100644 --- a/GSA_oM/Enum/TaskType.cs +++ b/GSA_oM/Enum/AnalysisType.cs @@ -22,7 +22,7 @@ using System.ComponentModel; -namespace BH.oM.External.GSA +namespace BH.oM.Adapters.GSA { [Description("Controls which type of analysis solver used for a Loadcombination.")] public enum AnalysisType diff --git a/GSA_oM/Enum/ConcreteDesignSpecification.cs b/GSA_oM/Enum/ConcreteDesignSpecification.cs index 6e4e6c89..23759ffe 100644 --- a/GSA_oM/Enum/ConcreteDesignSpecification.cs +++ b/GSA_oM/Enum/ConcreteDesignSpecification.cs @@ -26,7 +26,7 @@ using System.Text; using System.Threading.Tasks; -namespace BH.oM.GSA +namespace BH.oM.Adapters.GSA { /***************************************************/ diff --git a/GSA_oM/Enum/Country.cs b/GSA_oM/Enum/Country.cs index 2780ce22..87e5b042 100644 --- a/GSA_oM/Enum/Country.cs +++ b/GSA_oM/Enum/Country.cs @@ -26,7 +26,7 @@ using System.Text; using System.Threading.Tasks; -namespace BH.oM.GSA +namespace BH.oM.Adapters.GSA { /***************************************************/ diff --git a/GSA_oM/Enum/SteelDesignSpecification.cs b/GSA_oM/Enum/SteelDesignSpecification.cs index 0a524877..80b76ab2 100644 --- a/GSA_oM/Enum/SteelDesignSpecification.cs +++ b/GSA_oM/Enum/SteelDesignSpecification.cs @@ -26,7 +26,7 @@ using System.Text; using System.Threading.Tasks; -namespace BH.oM.GSA +namespace BH.oM.Adapters.GSA { /***************************************************/ diff --git a/GSA_oM/Fragments/AnalysisTaskFragment.cs b/GSA_oM/Fragments/AnalysisTaskFragment.cs index ff316a57..b377c7da 100644 --- a/GSA_oM/Fragments/AnalysisTaskFragment.cs +++ b/GSA_oM/Fragments/AnalysisTaskFragment.cs @@ -24,7 +24,7 @@ using BH.oM.Base; using System.ComponentModel; -namespace BH.oM.External.GSA +namespace BH.oM.Adapters.GSA { [Description("Fragment to be put on a LoadCombination to help you control the analysis task type to use in GSA and for which stage the combination should be run.")] public class AnalysisTaskFragment : IFragment diff --git a/GSA_oM/GSA_oM.csproj b/GSA_oM/GSA_oM.csproj index e885df2c..7cdfb7ba 100644 --- a/GSA_oM/GSA_oM.csproj +++ b/GSA_oM/GSA_oM.csproj @@ -7,7 +7,7 @@ {3634FF67-B327-4C2F-BF45-E13E8FFF69A6} Library Properties - BH.oM.GSA + BH.oM.Adapters.GSA GSA_oM v4.5.2 512 @@ -53,11 +53,14 @@ - + + + +