Skip to content

Commit b65667f

Browse files
author
Fraser Greenroyd
committed
Upgrade projects to NetStandard on a config option
1 parent 567a842 commit b65667f

4 files changed

Lines changed: 49 additions & 15 deletions

File tree

SQL_Adapter/SQL_Adapter.csproj

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net472</TargetFramework>
3+
<PropertyGroup>
54
<AssemblyVersion>6.0.0.0</AssemblyVersion>
65
<Description>https://github.com/BHoM/SQL_Toolkit</Description>
76
<Version>5.0.0</Version>
87
<Authors>BHoM</Authors>
98
<Copyright>Copyright © https://github.com/BHoM</Copyright>
109
<RootNamespace>BH.Adapter.SQL</RootNamespace>
1110
<FileVersion>6.1.0.0</FileVersion>
11+
<Configurations>Debug;Release;ZeroCodeTool</Configurations>
12+
<OutputPath>..\Build\</OutputPath>
1213
</PropertyGroup>
1314

14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<OutputPath>..\Build\</OutputPath>
15+
<PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
16+
<TargetFramework>net472</TargetFramework>
17+
<DefineConstants>INSTALLERDEPLOY</DefineConstants>
1618
</PropertyGroup>
19+
<PropertyGroup Condition="'$(Configuration)'=='ZeroCodeTool'">
20+
<TargetFramework>netstandard2.0</TargetFramework>
21+
<DefineConstants>ZCTDEPLOY</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup Condition="'$(Configuration)'=='ZeroCodeTool'">
25+
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
26+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
27+
</ItemGroup>
1728

1829
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
1930
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />

SQL_Engine/SQL_Engine.csproj

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net472</TargetFramework>
54
<AssemblyVersion>6.0.0.0</AssemblyVersion>
65
<Description>https://github.com/BHoM/SQL_Toolkit</Description>
76
<Version>5.0.0</Version>
87
<Authors>BHoM</Authors>
98
<Copyright>Copyright © https://github.com/BHoM</Copyright>
109
<RootNamespace>BH.Engine.SQL</RootNamespace>
1110
<FileVersion>6.1.0.0</FileVersion>
11+
<Configurations>Debug;Release;ZeroCodeTool</Configurations>
12+
<OutputPath>..\Build\</OutputPath>
1213
</PropertyGroup>
1314

14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<OutputPath>..\Build\</OutputPath>
15+
<PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
16+
<TargetFramework>net472</TargetFramework>
17+
<DefineConstants>INSTALLERDEPLOY</DefineConstants>
1618
</PropertyGroup>
19+
<PropertyGroup Condition="'$(Configuration)'=='ZeroCodeTool'">
20+
<TargetFramework>netstandard2.0</TargetFramework>
21+
<DefineConstants>ZCTDEPLOY</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup Condition="'$(Configuration)'=='ZeroCodeTool'">
25+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
26+
</ItemGroup>
1727

1828
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
1929
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />

SQL_Toolkit.sln

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
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.5.33530.505
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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQL_Adapter", "SQL_Adapter\SQL_Adapter.csproj", "{4D861E16-CEEC-4953-8F6A-1708D8167329}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_oM", "SQL_oM\SQL_oM.csproj", "{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQL_oM", "SQL_oM\SQL_oM.csproj", "{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Engine", "SQL_Engine\SQL_Engine.csproj", "{089E0C4A-E022-4DAE-868D-B46F0DE06074}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQL_Engine", "SQL_Engine\SQL_Engine.csproj", "{089E0C4A-E022-4DAE-868D-B46F0DE06074}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Debug|Any CPU = Debug|Any CPU
1515
Release|Any CPU = Release|Any CPU
16+
ZeroCodeTool|Any CPU = ZeroCodeTool|Any CPU
1617
EndGlobalSection
1718
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1819
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1920
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Debug|Any CPU.Build.0 = Debug|Any CPU
2021
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Release|Any CPU.ActiveCfg = Release|Any CPU
2122
{4D861E16-CEEC-4953-8F6A-1708D8167329}.Release|Any CPU.Build.0 = Release|Any CPU
23+
{4D861E16-CEEC-4953-8F6A-1708D8167329}.ZeroCodeTool|Any CPU.ActiveCfg = ZeroCodeTool|Any CPU
24+
{4D861E16-CEEC-4953-8F6A-1708D8167329}.ZeroCodeTool|Any CPU.Build.0 = ZeroCodeTool|Any CPU
2225
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2326
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Debug|Any CPU.Build.0 = Debug|Any CPU
2427
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Release|Any CPU.ActiveCfg = Release|Any CPU
2528
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.ZeroCodeTool|Any CPU.ActiveCfg = ZeroCodeTool|Any CPU
30+
{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.ZeroCodeTool|Any CPU.Build.0 = ZeroCodeTool|Any CPU
2631
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2732
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Debug|Any CPU.Build.0 = Debug|Any CPU
2833
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Release|Any CPU.ActiveCfg = Release|Any CPU
2934
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.ZeroCodeTool|Any CPU.ActiveCfg = ZeroCodeTool|Any CPU
36+
{089E0C4A-E022-4DAE-868D-B46F0DE06074}.ZeroCodeTool|Any CPU.Build.0 = ZeroCodeTool|Any CPU
3037
EndGlobalSection
3138
GlobalSection(SolutionProperties) = preSolution
3239
HideSolutionNode = FALSE

SQL_oM/SQL_oM.csproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net472</TargetFramework>
54
<AssemblyVersion>6.0.0.0</AssemblyVersion>
65
<Description>https://github.com/BHoM/SQL_Toolkit</Description>
76
<Version>5.0.0</Version>
87
<Authors>BHoM</Authors>
98
<Copyright>Copyright © https://github.com/BHoM</Copyright>
109
<RootNamespace>BH.oM.SQL</RootNamespace>
1110
<FileVersion>6.1.0.0</FileVersion>
11+
<Configurations>Debug;Release;ZeroCodeTool</Configurations>
12+
<OutputPath>..\Build\</OutputPath>
1213
</PropertyGroup>
1314

14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<OutputPath>..\Build\</OutputPath>
15+
<PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
16+
<TargetFramework>net472</TargetFramework>
17+
<DefineConstants>INSTALLERDEPLOY</DefineConstants>
18+
</PropertyGroup>
19+
<PropertyGroup Condition="'$(Configuration)'=='ZeroCodeTool'">
20+
<TargetFramework>netstandard2.0</TargetFramework>
21+
<DefineConstants>ZCTDEPLOY</DefineConstants>
1622
</PropertyGroup>
1723

1824
<Target Name="PostBuild" AfterTargets="PostBuildEvent">

0 commit comments

Comments
 (0)