Skip to content

Commit fb66116

Browse files
author
Fraser Greenroyd
committed
Upgrade to .NetStandard2.0
1 parent b849ac7 commit fb66116

File tree

5 files changed

+37
-288
lines changed

5 files changed

+37
-288
lines changed

‎Socket_Adapter/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎Socket_Adapter/Socket_Adapter.csproj

Lines changed: 26 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,46 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{FFEF6E83-840B-41B3-94A1-7DD10550AB02}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFramework>netstandard2.0</TargetFramework>
105
<RootNamespace>BH.Adapter.Socket</RootNamespace>
11-
<AssemblyName>Socket_Adapter</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>..\Build\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>..\Build\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
6+
<BaseOutputPath>..\Build\</BaseOutputPath>
7+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
318
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="MongoDB.Bson" Version="2.18.0" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\Socket_oM\Socket_oM.csproj" />
16+
</ItemGroup>
17+
3218
<ItemGroup>
3319
<Reference Include="Adapter_oM">
34-
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
35-
<Private>False</Private>
36-
<SpecificVersion>False</SpecificVersion>
20+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
3721
</Reference>
3822
<Reference Include="BHoM">
39-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
40-
<Private>False</Private>
41-
<SpecificVersion>False</SpecificVersion>
23+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
4224
</Reference>
4325
<Reference Include="BHoM_Adapter">
44-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
45-
<Private>False</Private>
46-
<SpecificVersion>False</SpecificVersion>
26+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
4727
</Reference>
4828
<Reference Include="BHoM_Engine">
49-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
50-
<Private>False</Private>
51-
<SpecificVersion>False</SpecificVersion>
29+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
5230
</Reference>
5331
<Reference Include="Data_oM">
54-
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
55-
<Private>False</Private>
56-
<SpecificVersion>False</SpecificVersion>
57-
</Reference>
58-
<Reference Include="MongoDB.Bson, Version=2.18.0.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\packages\MongoDB.Bson.2.18.0\lib\net472\MongoDB.Bson.dll</HintPath>
32+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
6033
</Reference>
6134
<Reference Include="Reflection_Engine">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
64-
<Private>False</Private>
35+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
6536
</Reference>
6637
<Reference Include="Serialiser_Engine">
67-
<HintPath>C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
68-
<Private>False</Private>
69-
<SpecificVersion>False</SpecificVersion>
38+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
7039
</Reference>
71-
<Reference Include="System" />
72-
<Reference Include="System.Core" />
73-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
75-
</Reference>
76-
<Reference Include="System.Xml.Linq" />
77-
<Reference Include="System.Data.DataSetExtensions" />
78-
<Reference Include="Microsoft.CSharp" />
79-
<Reference Include="System.Data" />
80-
<Reference Include="System.Net.Http" />
81-
<Reference Include="System.Xml" />
8240
</ItemGroup>
83-
<ItemGroup>
84-
<Compile Include="AdapterActions\Pull.cs" />
85-
<Compile Include="AdapterActions\Push.cs" />
86-
<Compile Include="Socket_Adapter.cs" />
87-
<Compile Include="Tcp\DataEvent.cs" />
88-
<Compile Include="Tcp\Global.cs" />
89-
<Compile Include="Tcp\DataTransmitter.cs" />
90-
<Compile Include="Udp\SocketLink_Udp.cs" />
91-
<Compile Include="Tcp\SocketServer_Tcp.cs" />
92-
<Compile Include="Udp\MessageEvent_Udp.cs" />
93-
<Compile Include="Udp\StateObject_Udp.cs" />
94-
<Compile Include="Udp\SocketServer_Udp.cs" />
95-
<Compile Include="Properties\AssemblyInfo.cs" />
96-
<Compile Include="Tcp\SocketLink_Tcp.cs" />
97-
</ItemGroup>
98-
<ItemGroup>
99-
<ProjectReference Include="..\Socket_oM\Socket_oM.csproj">
100-
<Project>{3f378f18-88db-4139-9a20-00bca576cfb1}</Project>
101-
<Name>Socket_oM</Name>
102-
<Private>False</Private>
103-
</ProjectReference>
104-
</ItemGroup>
105-
<ItemGroup>
106-
<None Include="packages.config" />
107-
</ItemGroup>
108-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109-
<PropertyGroup>
110-
<PostBuildEvent>
111-
xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y
112-
xcopy "$(TargetDir)MongoDB.Bson.dll" "C:\ProgramData\BHoM\Assemblies" /Y
113-
</PostBuildEvent>
114-
</PropertyGroup>
115-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
116-
Other similar extension points exist, see Microsoft.Common.targets.
117-
<Target Name="BeforeBuild">
118-
</Target>
119-
<Target Name="AfterBuild">
41+
42+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
43+
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y&#xD;&#xA;xcopy &quot;$(TargetDir)MongoDB.Bson.dll&quot; &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />
12044
</Target>
121-
-->
122-
</Project>
45+
46+
</Project>

‎Socket_Adapter/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Socket_oM/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎Socket_oM/Socket_oM.csproj

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{3F378F18-88DB-4139-9A20-00BCA576CFB1}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BH.oM.Socket</RootNamespace>
11-
<AssemblyName>Socket_oM</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>..\Build\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>..\Build\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<RootNamespace>BH.oM.Adapters.Socket</RootNamespace>
6+
<BaseOutputPath>..\Build\</BaseOutputPath>
317
</PropertyGroup>
8+
329
<ItemGroup>
3310
<Reference Include="BHoM">
34-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
35-
<Private>False</Private>
36-
<SpecificVersion>False</SpecificVersion>
11+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
3712
</Reference>
38-
<Reference Include="System" />
39-
<Reference Include="System.Core" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="System.Data" />
44-
<Reference Include="System.Net.Http" />
45-
<Reference Include="System.Xml" />
4613
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="DataPackage.cs" />
49-
<Compile Include="Properties\AssemblyInfo.cs" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<None Include="Versioning_40.json" />
53-
</ItemGroup>
54-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
55-
<PropertyGroup>
56-
<PostBuildEvent>
57-
xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y
58-
</PostBuildEvent>
59-
</PropertyGroup>
60-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61-
Other similar extension points exist, see Microsoft.Common.targets.
62-
<Target Name="BeforeBuild">
63-
</Target>
64-
<Target Name="AfterBuild">
14+
15+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
16+
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />
6517
</Target>
66-
-->
18+
6719
</Project>

0 commit comments

Comments
 (0)