Update namespace

BHoM · Jun 3, 2020 · e104543 · e104543
1 parent 7fc4eff
commit e104543
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 15 deletions.
diff --git 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
@@ -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
@@ -20,10 +20,10 @@
  * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
  */
 
-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
@@ -7,7 +7,7 @@
     <ProjectGuid>{CA275200-B50F-4B09-BE44-FBB106E3DE42}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BH.Engine.GSA</RootNamespace>
+    <RootNamespace>BH.Engine.Adapters.GSA</RootNamespace>
     <AssemblyName>GSA_Engine</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -126,6 +126,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="Versioning_32.json" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Compute\" />

diff --git 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
@@ -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"
+    }
+  }
+} 
diff --git a/GSA_oM/Enum/TaskType.cs → GSA_oM/Enum/AnalysisType.cs b/GSA_oM/Enum/TaskType.cs → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
     <ProjectGuid>{3634FF67-B327-4C2F-BF45-E13E8FFF69A6}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BH.oM.GSA</RootNamespace>
+    <RootNamespace>BH.oM.Adapters.GSA</RootNamespace>
     <AssemblyName>GSA_oM</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -53,11 +53,14 @@
     <Compile Include="Enum\ConcreteDesignSpecification.cs" />
     <Compile Include="Enum\Country.cs" />
     <Compile Include="Enum\SteelDesignSpecification.cs" />
-    <Compile Include="Enum\TaskType.cs" />
+    <Compile Include="Enum\AnalysisType.cs" />
     <Compile Include="Fragments\AnalysisTaskFragment.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings\GSAConfig.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Versioning_32.json" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/GSA_oM/Settings/GSAConfig.cs b/GSA_oM/Settings/GSAConfig.cs
@@ -28,7 +28,7 @@
 using BH.oM.Adapter;
 using BH.oM.Base;
 
-namespace BH.oM.GSA
+namespace BH.oM.Adapters.GSA
 {
     public class GSAConfig : ActionConfig
     {

diff --git a/GSA_oM/Versioning_32.json b/GSA_oM/Versioning_32.json
@@ -0,0 +1,30 @@
+{
+  "Namespace": {
+    "ToNew": {
+
+    },
+    "ToOld": {
+
+    }
+  },
+  "Type": {
+    "ToNew": {
+	      "BH.oM.GSA.ConcreteDesignSpecification":  "BH.oM.Adapters.GSA.ConcreteDesignSpecification"
+		  "BH.oM.GSA.Country":  "BH.oM.Adapters.GSA.Country"
+		  "BH.oM.GSA.SteelDesignSpecification":  "BH.oM.Adapters.GSA.SteelDesignSpecification"
+		  "BH.oM.GSA.External.AnalysisType":  "BH.oM.Adapters.GSA.AnalysisType"
+		  "BH.oM.GSA.External.AnalysisTaskFragment":  "BH.oM.Adapters.GSA.AnalysisTaskFragment"
+		  "BH.oM.GSA.GSAConfig":  "BH.oM.Adapters.GSA.GSAConfig"
+
+    },
+    "ToOld": {
+	      "BH.oM.Adapters.GSA.ConcreteDesignSpecification":  "BH.oM.GSA.ConcreteDesignSpecification"
+		  "BH.oM.Adapters.GSA.Country":  "BH.oM.GSA.Country"
+		  "BH.oM.Adapters.GSA.SteelDesignSpecification":  "BH.oM.GSA.SteelDesignSpecification"
+		  "BH.oM.Adapters.GSA.AnalysisType":  "BH.oM.External.GSA.AnalysisType"
+		  "BH.oM.Adapters.GSA.AnalysisTaskFragment":  "BH.oM.External.GSA.AnalysisTaskFragment"
+		  "BH.oM.Adapters.GSA.GSAConfig":  "BH.oM.GSA.GSAConfig"
+
+    }
+  }
+}