Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 37 additions & 35 deletions SAP2000_Adapter/SAP2000_Adapter.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>

Check warning on line 1 in SAP2000_Adapter/SAP2000_Adapter.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_Adapter/SAP2000_Adapter.csproj#L1

CSProject files should be in the new format as used by core BHoM projects. Upgrading the file is possible for .Net Framework 4.7.2 projects as well. Please speak to a member of the DevOps team for assistance with this.
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -32,140 +32,145 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Acoustic_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Acoustic_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Acoustic_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Adapter_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Adapter_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Analytical_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Analytical_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Analytical_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Architecture_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Architecture_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Architecture_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="BHoM">
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="BHoM_Adapter">
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="BHoM_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="CSiAPIv1">
<HintPath>..\libs\v26\CSiAPIv1.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Data_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Data_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Dimensional_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Dimensional_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Dimensional_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Environment_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Environment_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Environment_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Geometry_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Geometry_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Graphics_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Graphics_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Graphics_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Humans_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Humans_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Humans_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Library_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Library_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Library_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Physical_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Physical_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Physical_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Physical_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Physical_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Physical_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Planning_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Planning_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Planning_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Quantities_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Quantities_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Quantities_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Results_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Results_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Results_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="SAP2000v1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=453d728ef24c6f5e, processorArchitecture=MSIL">
<HintPath>..\packages\BHoM.Interop.SAP2000v21.1.0.0\lib\net47\SAP2000v1.dll</HintPath>
<Reference Include="SAP2000v1">
<HintPath>..\libs\v26\SAP2000v1.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Serialiser_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Spatial_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Spatial_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Spatial_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Spatial_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Spatial_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Spatial_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Structure_AdapterModules">
<HintPath>C:\ProgramData\BHoM\Assemblies\Structure_AdapterModules.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Structure_AdapterModules.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Structure_Engine">
<HintPath>C:\ProgramData\BHoM\Assemblies\Structure_Engine.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Structure_Engine.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Structure_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Structure_oM.dll</HintPath>
<HintPath>$(ProgramData)\BHoM\Assemblies\Structure_oM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
Expand Down Expand Up @@ -237,9 +242,6 @@
<Compile Include="Types\SetupComparer.cs" />
<Compile Include="Types\SetupDependencies.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SAP2000_Engine\SAP2000_Engine.csproj">
<Project>{4bb31ae9-b7ce-42c8-80a4-484389d23de2}</Project>
Expand All @@ -254,7 +256,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

Check warning on line 259 in SAP2000_Adapter/SAP2000_Adapter.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_Adapter/SAP2000_Adapter.csproj#L259

Post Build event should be correctly set to copy the compiled DLL to the BHoM Assemblies folder
xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y
xcopy "$(TargetDir)SAP2000v1.dll" "C:\ProgramData\BHoM\Assemblies" /Y
</PostBuildEvent>
Expand All @@ -266,4 +268,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
4 changes: 0 additions & 4 deletions SAP2000_Adapter/packages.config

This file was deleted.

9 changes: 5 additions & 4 deletions SAP2000_Engine/SAP2000_Engine.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

Check warning on line 1 in SAP2000_Engine/SAP2000_Engine.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_Engine/SAP2000_Engine.csproj#L1

CSProject files should be in the new format as used by core BHoM projects. Upgrading the file is possible for .Net Framework 4.7.2 projects as well. Please speak to a member of the DevOps team for assistance with this.
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -116,6 +116,10 @@
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="SAP2000v1">
<HintPath>..\libs\v26\SAP2000v1.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Serialiser_Engine">
<HintPath>$(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
<Private>False</Private>
Expand Down Expand Up @@ -152,9 +156,6 @@
<ItemGroup>
<Folder Include="Create\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SAP2000_oM\SAP2000_oM.csproj">
<Project>{bc975b64-e35e-4155-a067-7a88505e61c2}</Project>
Expand All @@ -164,7 +165,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

Check warning on line 168 in SAP2000_Engine/SAP2000_Engine.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_Engine/SAP2000_Engine.csproj#L168

Post Build event should be correctly set to copy the compiled DLL to the BHoM Assemblies folder
xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y
</PostBuildEvent>
</PropertyGroup>
Expand All @@ -175,4 +176,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
5 changes: 0 additions & 5 deletions SAP2000_Engine/packages.config

This file was deleted.

4 changes: 4 additions & 0 deletions SAP2000_oM/SAP2000_oM.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

Check warning on line 1 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L1

CSProject files should be in the new format as used by core BHoM projects. Upgrading the file is possible for .Net Framework 4.7.2 projects as well. Please speak to a member of the DevOps team for assistance with this.
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -32,27 +32,31 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Adapter_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>

Check failure on line 35 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L35

Project reference for 'Adapter_oM' should be set to '$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll'
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="BHoM">
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>

Check failure on line 40 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L40

Project reference for 'BHoM' should be set to '$(ProgramData)\BHoM\Assemblies\BHoM.dll'
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Data_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>

Check failure on line 45 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L45

Project reference for 'Data_oM' should be set to '$(ProgramData)\BHoM\Assemblies\Data_oM.dll'
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Quantities_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Quantities_oM.dll</HintPath>

Check failure on line 50 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L50

Project reference for 'Quantities_oM' should be set to '$(ProgramData)\BHoM\Assemblies\Quantities_oM.dll'
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="SAP2000v1">
<HintPath>..\libs\v26\SAP2000v1.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Structure_oM">
<HintPath>C:\ProgramData\BHoM\Assemblies\Structure_oM.dll</HintPath>

Check failure on line 59 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L59

Project reference for 'Structure_oM' should be set to '$(ProgramData)\BHoM\Assemblies\Structure_oM.dll'
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
Expand Down Expand Up @@ -93,7 +97,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

Check warning on line 100 in SAP2000_oM/SAP2000_oM.csproj

View check run for this annotation

BHoMBot-CI / project-compliance

SAP2000_oM/SAP2000_oM.csproj#L100

Post Build event should be correctly set to copy the compiled DLL to the BHoM Assemblies folder
xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y
</PostBuildEvent>
</PropertyGroup>
Expand Down
Loading