ADSECGH-59 Uprev AdSec API to v2.0.3 (#93)

* ADSECGH-59 AdSec API v2.0.1 * ADSECGH-59 v0.9.28 * ADSECGH-59 OasysGH v1.1.0 * ADSECGH-59 - update to latest OasysGH and AdSec API(using latest OasysUnit) * ADSECGH-59: regression test updated * feat: ADSECGH-59 namespace should follow folder structure * feat: namespace should follow folder structure * feat: update to latest AdSec Nuget package * feat: update coverlet collector version to 6.0.2 * feat: added GenerateResourceUsePreserializedResources on the csproj --------- Co-authored-by: Tilman Reinhardt <[email protected]> Co-authored-by: Sandeep Kumar <[email protected]> Co-authored-by: spsarras <[email protected]>
arup-group · Oct 23, 2024 · d469781 · d469781
1 parent fcdf31a
commit d469781
Show file tree

Hide file tree

Showing 19 changed files with 440 additions and 373 deletions.
diff --git a/AdSecGH/AdSecGH.csproj b/AdSecGH/AdSecGH.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <TargetFramework>net48</TargetFramework>
     <AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
     <PlatformTarget>x64</PlatformTarget>
@@ -11,60 +12,59 @@
     <RepositoryUrl>https://github.com/arup-group/AdSec-Grasshopper</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIcon>AdSecLogo128.png</PackageIcon>
-    <Version>0.9.27-beta</Version>
+    <Version>0.9.28-beta</Version>
     <Description>Official Oasys AdSec Grasshopper Plugin
 
-AdSecGH is pre-release and under active development, including further testing to be undertaken. It is provided "as-is" and you bear the risk of using it. Future versions may contain breaking changes. Any files, results, or other types of output information created using AdSecGH should not be relied upon without thorough and independent checking.
+      AdSecGH is pre-release and under active development, including further testing to be undertaken. It is provided "as-is" and you bear the risk of using it. Future versions may contain breaking changes. Any files, results, or other types of output information created using AdSecGH should not be relied upon without thorough and independent checking.
 
-The plugin requires a licensed version of AdSec to load.
+      The plugin requires a licensed version of AdSec to load.
 
-Contact [email protected] to request a free trial version.
+      Contact [email protected] to request a free trial version.
 
-Copyright © Oasys 1985 - 2024</Description>
+      Copyright © Oasys 1985 - 2024
+    </Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Remove="Components\OBSOLETE\**" />
-    <Compile Remove="Properties\Icons\Icons\**" />
-    <EmbeddedResource Remove="Components\OBSOLETE\**" />
-    <EmbeddedResource Remove="Properties\Icons\Icons\**" />
-    <None Remove="Components\OBSOLETE\**" />
-    <None Remove="Properties\Icons\Icons\**" />
+    <Compile Remove="Components\OBSOLETE\**"/>
+    <Compile Remove="Properties\Icons\Icons\**"/>
+    <EmbeddedResource Remove="Components\OBSOLETE\**"/>
+    <EmbeddedResource Remove="Properties\Icons\Icons\**"/>
+    <None Remove="Components\OBSOLETE\**"/>
+    <None Remove="Properties\Icons\Icons\**"/>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.DirectoryServices.AccountManagement" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System"/>
+    <Reference Include="System.Core"/>
+    <Reference Include="System.Data"/>
+    <Reference Include="System.DirectoryServices.AccountManagement"/>
+    <Reference Include="System.Net.Http"/>
+    <Reference Include="System.Xml"/>
+    <Reference Include="System.Xml.Linq"/>
+    <Reference Include="System.Drawing"/>
+    <Reference Include="System.Windows.Forms"/>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\README.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="licenses\AdSec.pdf" />
-    <None Include="licenses\EntityFramework" />
-    <None Include="licenses\Newtonsoft" />
-    <None Include="licenses\UnitsNet" />
+    <None Include="licenses\AdSec.pdf"/>
+    <None Include="licenses\EntityFramework"/>
+    <None Include="licenses\Newtonsoft"/>
+    <None Include="licenses\UnitsNet"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AdSec">
-      <Version>2.0.0.21</Version>
-    </PackageReference>
+    <PackageReference Include="AdSec" Version="2.0.3.300"/>
     <PackageReference Include="Grasshopper" Version="6.27.20176.5001" IncludeAssets="compile;build">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="OasysGH" Version="1.0.4" />
+    <PackageReference Include="OasysGH" Version="1.2.4"/>
     <PackageReference Include="OasysUnits">
-      <Version>1.0.0</Version>
+      <Version>1.2.1</Version>
     </PackageReference>
     <PackageReference Include="RhinoCommon">
       <Version>6.27.20176.5001</Version>
@@ -73,7 +73,7 @@ Copyright © Oasys 1985 - 2024</Description>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Properties\Icons\AdSecLogo128.png" Pack="true" PackagePath="" />
+    <None Include="Properties\Icons\AdSecLogo128.png" Pack="true" PackagePath=""/>
   </ItemGroup>
   <ItemGroup>
     <None Update="Properties\Icons\AdSecLogo64.png">
@@ -82,14 +82,14 @@ Copyright © Oasys 1985 - 2024</Description>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="AdSecGHTests" />
+    <InternalsVisibleTo Include="AdSecGHTests"/>
   </ItemGroup>
   <PropertyGroup Condition="$(Configuration) == 'Debug' AND $([MSBuild]::IsOSPlatform(Windows))">
     <StartProgram>C:\Program Files\Rhino 7\System\Rhino.exe</StartProgram>
     <StartArguments></StartArguments>
     <StartAction>Program</StartAction>
   </PropertyGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="Copy &quot;$(TargetPath)&quot; &quot;$(TargetDir)AdSec.gha&quot;&#xD;&#xA;Copy &quot;$(ProjectDir)obj\OasysUnits.dll&quot; &quot;$(TargetDir)OasysUnits.dll&quot;&#xD;&#xA;Copy &quot;Properties\Icons\AdSecLogo64.png&quot; &quot;$(TargetDir)AdSecIcon.png&quot;" />
+    <Exec Command="Copy &quot;$(TargetPath)&quot; &quot;$(TargetDir)AdSec.gha&quot;&#xD;&#xA;Copy &quot;$(ProjectDir)obj\OasysUnits.dll&quot; &quot;$(TargetDir)OasysUnits.dll&quot;&#xD;&#xA;Copy &quot;Properties\Icons\AdSecLogo64.png&quot; &quot;$(TargetDir)AdSecIcon.png&quot;"/>
   </Target>
 </Project>
diff --git a/AdSecGH/AdSecGHInfo.cs b/AdSecGH/AdSecGHInfo.cs
@@ -31,7 +31,7 @@ public string IconUrl
     internal const string ProductName = "AdSec";
     internal const string TermsConditions
       = "Oasys terms and conditions apply. See https://www.oasys-software.com/terms-conditions for details. ";
-    internal const string Vers = "0.9.27";
+    internal const string Vers = "0.9.28";
     internal static string Disclaimer = PluginName
       + " is pre-release and under active development, including further testing to be undertaken. It is provided \"as-is\" and you bear the risk of using it. Future versions may contain breaking changes. Any files, results, or other types of output information created using "
       + PluginName + " should not be relied upon without thorough and independent checking. ";

diff --git a/AdSecGH/Components/2_Profile/CreateProfile.cs b/AdSecGH/Components/2_Profile/CreateProfile.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 
+using AdSecGH.Helpers;
 using AdSecGH.Helpers.GH;
 using AdSecGH.Parameters;
 
 using Grasshopper.Kernel;
 using Grasshopper.Kernel.Parameters;
 
-using Oasys.Interop;
 using Oasys.Taxonomy.Profiles;
 
 using OasysGH;

diff --git a/AdSecGH/Components/2_Profile/ProfileProperties.cs b/AdSecGH/Components/2_Profile/ProfileProperties.cs
@@ -74,7 +74,7 @@ protected override void SolveInstance(IGH_DataAccess DA) {
       var unitSystem = new UnitSystem(baseUnits);
       AreaUnit areaUnit = new Area(1, unitSystem).Unit;
 
-      SectionModulusUnit wUnit = SectionModulusUnit.Undefined;
+      SectionModulusUnit wUnit = SectionModulusUnit.CubicMeter;
       switch (lengthUnit) {
         case LengthUnit.Millimeter:
           wUnit = SectionModulusUnit.CubicMillimeter;