Skip to content

Commit ffab07c

Browse files
Merge branch 'main' into Lusas_Toolkit-#339-UpgradeInteropForMinorVersion
2 parents 96dc04c + 931386c commit ffab07c

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Lusas_Adapter/LusasAdapter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public LusasV17Adapter(string filePath, LusasConfig lusasConfig = null, bool act
9696
{typeof(RigidLink), new List<Type> { typeof(LinkConstraint), typeof(Node) } },
9797
{typeof(ISurfaceProperty), new List<Type> { typeof(IMaterialFragment) } },
9898
{typeof(ILoad), new List<Type> {typeof(Loadcase) } },
99+
{typeof(LoadCombination), new List<Type> {typeof(Loadcase) } },
99100
};
100101

101102
if (string.IsNullOrWhiteSpace(filePath))

Lusas_Adapter/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyVersion("5.0.0.0")]
58-
[assembly: AssemblyFileVersion("5.3.0.0")]
57+
[assembly: AssemblyVersion("6.0.0.0")]
58+
[assembly: AssemblyFileVersion("6.0.0.0")]
5959

6060

6161

Lusas_Engine/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyVersion("5.0.0.0")]
58-
[assembly: AssemblyFileVersion("5.3.0.0")]
57+
[assembly: AssemblyVersion("6.0.0.0")]
58+
[assembly: AssemblyFileVersion("6.0.0.0")]
5959

6060

6161

Lusas_oM/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyVersion("5.0.0.0")]
58-
[assembly: AssemblyFileVersion("5.3.0.0")]
57+
[assembly: AssemblyVersion("6.0.0.0")]
58+
[assembly: AssemblyFileVersion("6.0.0.0")]
5959

6060

6161

0 commit comments

Comments
 (0)