Skip to content

Commit 8c7caae

Browse files
author
Fraser Greenroyd
committed
Upgrade projects to .NetStandard2.0
1 parent 1ce6b79 commit 8c7caae

File tree

7 files changed

+74
-402
lines changed

7 files changed

+74
-402
lines changed

‎SQL_Adapter/Properties/AssemblyInfo.cs

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

‎SQL_Adapter/SQL_Adapter.csproj

Lines changed: 20 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,35 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTarget="" 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>{4D861E16-CEEC-4953-8F6A-1708D8167329}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BH.Adapter.SQL</RootNamespace>
11-
<AssemblyName>SQL_Adapter</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>..\Build\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>..\Build\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
326
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\SQL_Engine\SQL_Engine.csproj" />
14+
<ProjectReference Include="..\SQL_oM\SQL_oM.csproj" />
15+
</ItemGroup>
16+
3317
<ItemGroup>
3418
<Reference Include="Adapter_oM">
35-
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
36-
<Private>False</Private>
37-
<SpecificVersion>False</SpecificVersion>
19+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
3820
</Reference>
3921
<Reference Include="BHoM">
40-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
41-
<Private>False</Private>
42-
<SpecificVersion>False</SpecificVersion>
22+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
4323
</Reference>
4424
<Reference Include="BHoM_Adapter">
45-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
46-
<Private>False</Private>
47-
<SpecificVersion>False</SpecificVersion>
25+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
4826
</Reference>
4927
<Reference Include="BHoM_Engine">
50-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
51-
<Private>False</Private>
52-
<SpecificVersion>False</SpecificVersion>
28+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
5329
</Reference>
5430
<Reference Include="Data_oM">
55-
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
56-
<Private>False</Private>
57-
<SpecificVersion>False</SpecificVersion>
31+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
5832
</Reference>
59-
<Reference Include="System" />
60-
<Reference Include="System.Core" />
61-
<Reference Include="System.Xml.Linq" />
62-
<Reference Include="System.Data.DataSetExtensions" />
63-
<Reference Include="Microsoft.CSharp" />
64-
<Reference Include="System.Data" />
65-
<Reference Include="System.Net.Http" />
66-
<Reference Include="System.Xml" />
6733
</ItemGroup>
68-
<ItemGroup>
69-
<Compile Include="AdapterActions\Execute.cs" />
70-
<Compile Include="AdapterActions\Pull.cs" />
71-
<Compile Include="AdapterActions\Push.cs" />
72-
<Compile Include="AdapterActions\Remove.cs" />
73-
<Compile Include="Convert\ToDictionary.cs" />
74-
<Compile Include="SqlAdapter.cs" />
75-
<Compile Include="Properties\AssemblyInfo.cs" />
76-
</ItemGroup>
77-
<ItemGroup>
78-
<ProjectReference Include="..\SQL_Engine\SQL_Engine.csproj">
79-
<Project>{089e0c4a-e022-4dae-868d-b46f0de06074}</Project>
80-
<Name>SQL_Engine</Name>
81-
</ProjectReference>
82-
<ProjectReference Include="..\SQL_oM\SQL_oM.csproj">
83-
<Project>{0a6a3dbf-220b-4c64-8ce5-3e0ddc479404}</Project>
84-
<Name>SQL_oM</Name>
85-
</ProjectReference>
86-
</ItemGroup>
87-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="" />
88-
<PropertyGroup>
89-
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y</PostBuildEvent>
90-
</PropertyGroup>
34+
9135
</Project>

‎SQL_Engine/Properties/AssemblyInfo.cs

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

‎SQL_Engine/SQL_Engine.csproj

Lines changed: 23 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,36 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTarget="" 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>{089E0C4A-E022-4DAE-868D-B46F0DE06074}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BH.Engine.SQL</RootNamespace>
11-
<AssemblyName>SQL_Engine</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>..\Build\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>..\Build\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<BaseOutputPath>..\Build\</BaseOutputPath>
6+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
327
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<ProjectReference Include="..\SQL_oM\SQL_oM.csproj" />
15+
</ItemGroup>
16+
3317
<ItemGroup>
3418
<Reference Include="Adapter_oM">
35-
<SpecificVersion>False</SpecificVersion>
36-
<Private>False</Private>
37-
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
19+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
3820
</Reference>
3921
<Reference Include="BHoM">
40-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
41-
<Private>False</Private>
42-
<SpecificVersion>False</SpecificVersion>
22+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
4323
</Reference>
4424
<Reference Include="BHoM_Engine">
45-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
46-
<Private>False</Private>
47-
<SpecificVersion>False</SpecificVersion>
25+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
4826
</Reference>
4927
<Reference Include="Data_oM">
50-
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
51-
<Private>False</Private>
52-
<SpecificVersion>False</SpecificVersion>
28+
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
5329
</Reference>
54-
<Reference Include="System" />
55-
<Reference Include="System.Core" />
56-
<Reference Include="System.Xml.Linq" />
57-
<Reference Include="System.Data.DataSetExtensions" />
58-
<Reference Include="Microsoft.CSharp" />
59-
<Reference Include="System.Data" />
60-
<Reference Include="System.Net.Http" />
61-
<Reference Include="System.Xml" />
6230
</ItemGroup>
63-
<ItemGroup>
64-
<Compile Include="Compute\NewTableCommand.cs" />
65-
<Compile Include="Convert\ToSqlTypeString.cs" />
66-
<Compile Include="Convert\ToSqlCommand.cs" />
67-
<Compile Include="Convert\FromDictionary.cs" />
68-
<Compile Include="Properties\AssemblyInfo.cs" />
69-
</ItemGroup>
70-
<ItemGroup>
71-
<ProjectReference Include="..\SQL_oM\SQL_oM.csproj">
72-
<Project>{0a6a3dbf-220b-4c64-8ce5-3e0ddc479404}</Project>
73-
<Name>SQL_oM</Name>
74-
</ProjectReference>
75-
</ItemGroup>
76-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="" />
77-
<PropertyGroup>
78-
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y</PostBuildEvent>
79-
</PropertyGroup>
31+
32+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
33+
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />
34+
</Target>
35+
8036
</Project>

‎SQL_Toolkit.sln

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28307.1382
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33403.182
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Adapter", "SQL_Adapter\SQL_Adapter.csproj", "{4D861E16-CEEC-4953-8F6A-1708D8167329}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_oM", "SQL_oM\SQL_oM.csproj", "{7187B692-350F-4DB6-BCFC-8FAEEF13A607}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_oM", "SQL_oM\SQL_oM.csproj", "{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Engine", "SQL_Engine\SQL_Engine.csproj", "{5882A976-3E46-41D5-9632-29E0E7500C87}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Engine", "SQL_Engine\SQL_Engine.csproj", "{089E0C4A-E022-4DAE-868D-B46F0DE06074}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Adapter", "SQL_Adapter\SQL_Adapter.csproj", "{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Debug|Any CPU = Debug|Any CPU
1515
Release|Any CPU = Release|Any CPU
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Release|Any CPU.Build.0 = Release|Any CPU
22-
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Release|Any CPU.Build.0 = Release|Any CPU
18+
{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Release|Any CPU.ActiveCfg = Release|Any CPU
21+
{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{5882A976-3E46-41D5-9632-29E0E7500C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{5882A976-3E46-41D5-9632-29E0E7500C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{5882A976-3E46-41D5-9632-29E0E7500C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{5882A976-3E46-41D5-9632-29E0E7500C87}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Release|Any CPU.Build.0 = Release|Any CPU
3030
EndGlobalSection
3131
GlobalSection(SolutionProperties) = preSolution
3232
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)