Skip to content

Commit

Permalink
[Add] support for netstandard 2.0 in CDP4Common and CDP4JsonSerializer
Browse files Browse the repository at this point in the history
[Add] support for netstandard 2.0 in CDP4Dal, CDP4ServicesDal and CDP4WspDal
[Add] CDP4ServicesDal.NetCore.Tests project
[Add] CDP4WspDal.NetCore.Tests
  • Loading branch information
sam.gerene committed Jan 7, 2018
1 parent 7e73218 commit d83c3b2
Show file tree
Hide file tree
Showing 76 changed files with 7,856 additions and 813 deletions.
47 changes: 47 additions & 0 deletions CDP4-SDK.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,68 +31,115 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4WspDal", "CDP4WspDal\CD
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4WspDal.Tests", "CDP4WspDal.Tests\CDP4WspDal.Tests.csproj", "{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Dal.NetCore.Tests", "CDP4Dal.NetCore.Tests\CDP4Dal.NetCore.Tests.csproj", "{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4ServicesDal.NetCore.Tests", "CDP4ServicesDal.NetCore.Tests\CDP4ServicesDal.NetCore.Tests.csproj", "{588AA66A-067B-408F-A5A0-2CC90770850A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4WspDal.NetCore.Tests", "CDP4WspDal.NetCore.Tests\CDP4WspDal.NetCore.Tests.csproj", "{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Dev|Any CPU = Dev|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}.Dev|Any CPU.Build.0 = Debug|Any CPU
{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}.Release|Any CPU.Build.0 = Release|Any CPU
{850A39B6-BCB6-46D9-B7D7-8CED79302E19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{850A39B6-BCB6-46D9-B7D7-8CED79302E19}.Debug|Any CPU.Build.0 = Debug|Any CPU
{850A39B6-BCB6-46D9-B7D7-8CED79302E19}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{850A39B6-BCB6-46D9-B7D7-8CED79302E19}.Dev|Any CPU.Build.0 = Debug|Any CPU
{850A39B6-BCB6-46D9-B7D7-8CED79302E19}.Release|Any CPU.ActiveCfg = Release|Any CPU
{850A39B6-BCB6-46D9-B7D7-8CED79302E19}.Release|Any CPU.Build.0 = Release|Any CPU
{A8F3B7A2-DC51-40D7-B886-51174DDDF668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8F3B7A2-DC51-40D7-B886-51174DDDF668}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8F3B7A2-DC51-40D7-B886-51174DDDF668}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
{A8F3B7A2-DC51-40D7-B886-51174DDDF668}.Dev|Any CPU.Build.0 = Dev|Any CPU
{A8F3B7A2-DC51-40D7-B886-51174DDDF668}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8F3B7A2-DC51-40D7-B886-51174DDDF668}.Release|Any CPU.Build.0 = Release|Any CPU
{CCED2E8F-5072-45B0-B4A4-1200C348E903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCED2E8F-5072-45B0-B4A4-1200C348E903}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCED2E8F-5072-45B0-B4A4-1200C348E903}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
{CCED2E8F-5072-45B0-B4A4-1200C348E903}.Dev|Any CPU.Build.0 = Dev|Any CPU
{CCED2E8F-5072-45B0-B4A4-1200C348E903}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCED2E8F-5072-45B0-B4A4-1200C348E903}.Release|Any CPU.Build.0 = Release|Any CPU
{6410A3C1-F166-4B40-91E6-49CC312B968A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6410A3C1-F166-4B40-91E6-49CC312B968A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6410A3C1-F166-4B40-91E6-49CC312B968A}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
{6410A3C1-F166-4B40-91E6-49CC312B968A}.Dev|Any CPU.Build.0 = Dev|Any CPU
{6410A3C1-F166-4B40-91E6-49CC312B968A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6410A3C1-F166-4B40-91E6-49CC312B968A}.Release|Any CPU.Build.0 = Release|Any CPU
{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}.Dev|Any CPU.Build.0 = Dev|Any CPU
{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}.Release|Any CPU.Build.0 = Release|Any CPU
{39F6D678-F3EF-458A-9C6B-680F272314D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39F6D678-F3EF-458A-9C6B-680F272314D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39F6D678-F3EF-458A-9C6B-680F272314D3}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{39F6D678-F3EF-458A-9C6B-680F272314D3}.Dev|Any CPU.Build.0 = Debug|Any CPU
{39F6D678-F3EF-458A-9C6B-680F272314D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39F6D678-F3EF-458A-9C6B-680F272314D3}.Release|Any CPU.Build.0 = Release|Any CPU
{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}.Dev|Any CPU.Build.0 = Debug|Any CPU
{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}.Release|Any CPU.Build.0 = Release|Any CPU
{3CE04A57-83EE-4E31-8AC7-D99628C848E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3CE04A57-83EE-4E31-8AC7-D99628C848E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3CE04A57-83EE-4E31-8AC7-D99628C848E6}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{3CE04A57-83EE-4E31-8AC7-D99628C848E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3CE04A57-83EE-4E31-8AC7-D99628C848E6}.Release|Any CPU.Build.0 = Release|Any CPU
{81F3A560-BC12-4B2A-B60B-E64533E9AC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81F3A560-BC12-4B2A-B60B-E64533E9AC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81F3A560-BC12-4B2A-B60B-E64533E9AC99}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{81F3A560-BC12-4B2A-B60B-E64533E9AC99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81F3A560-BC12-4B2A-B60B-E64533E9AC99}.Release|Any CPU.Build.0 = Release|Any CPU
{6F9030E9-C774-4247-BA84-4CBF288A844D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F9030E9-C774-4247-BA84-4CBF288A844D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F9030E9-C774-4247-BA84-4CBF288A844D}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{6F9030E9-C774-4247-BA84-4CBF288A844D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F9030E9-C774-4247-BA84-4CBF288A844D}.Release|Any CPU.Build.0 = Release|Any CPU
{2FF7ED2F-F866-40B9-9FCC-D151404242F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FF7ED2F-F866-40B9-9FCC-D151404242F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FF7ED2F-F866-40B9-9FCC-D151404242F2}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{2FF7ED2F-F866-40B9-9FCC-D151404242F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FF7ED2F-F866-40B9-9FCC-D151404242F2}.Release|Any CPU.Build.0 = Release|Any CPU
{73547666-55AA-4364-9A5E-1A50693D1576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73547666-55AA-4364-9A5E-1A50693D1576}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73547666-55AA-4364-9A5E-1A50693D1576}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{73547666-55AA-4364-9A5E-1A50693D1576}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73547666-55AA-4364-9A5E-1A50693D1576}.Release|Any CPU.Build.0 = Release|Any CPU
{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Release|Any CPU.Build.0 = Release|Any CPU
{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}.Dev|Any CPU.Build.0 = Debug|Any CPU
{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7A734D4-B28C-4D40-9C20-7EBB70AAAF3C}.Release|Any CPU.Build.0 = Release|Any CPU
{588AA66A-067B-408F-A5A0-2CC90770850A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{588AA66A-067B-408F-A5A0-2CC90770850A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{588AA66A-067B-408F-A5A0-2CC90770850A}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{588AA66A-067B-408F-A5A0-2CC90770850A}.Dev|Any CPU.Build.0 = Debug|Any CPU
{588AA66A-067B-408F-A5A0-2CC90770850A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{588AA66A-067B-408F-A5A0-2CC90770850A}.Release|Any CPU.Build.0 = Release|Any CPU
{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}.Dev|Any CPU.Build.0 = Debug|Any CPU
{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46B293DE-39D4-4012-9FAA-DA7A62F0AD45}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 5 additions & 0 deletions CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
</PropertyGroup>

<ItemGroup>

<PackageReference Include="CDP4Common-CE" Version="1.0.1-rc02" />
<!--
<ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
<PackageReference Include="NLog" Version="4.5.0-rc03" />
-->
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion CDP4Common.Tests/CDP4Common.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@
</PropertyGroup>

<ItemGroup>

<PackageReference Include="CDP4Common-CE" Version="1.0.1-rc02" />
<!--
<ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
<PackageReference Include="NLog" Version="4.5.0-rc03" />
-->
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Moq" Version="4.8.0" />
<PackageReference Include="NLog" Version="4.5.0-rc03" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit.Console" Version="3.7.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
Expand Down
7 changes: 4 additions & 3 deletions CDP4Common/CDP4Common.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard1.6;netstandard2.0</TargetFrameworks>
<Company>RHEA System S.A.</Company>
<Title>CDP4Common Community Edition</Title>
<Version>1.0.0-rc10</Version>
<Version>1.0.1-rc02</Version>
<Description>CDP4 Common Class Library that contains DTOs, POCOs</Description>
<Copyright>Copyright © RHEA System S.A.</Copyright>
<Authors>Sam, Merlin, Alex, Naron, Patxi</Authors>
Expand All @@ -15,7 +15,8 @@
<RepositoryUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition.git</RepositoryUrl>
<PackageTags>CDP CDP4 ECSS-E-TM-10-25</PackageTags>
<PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
<releaseNotes>[Dwongrade] to NLog 4.5.0 per NLog-Project recommendations</releaseNotes>
<Configurations>Debug;Release</Configurations>
<releaseNotes>[Add] support for netstandard2.0</releaseNotes>
</PropertyGroup>

<ItemGroup>
Expand Down
77 changes: 42 additions & 35 deletions CDP4Common/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,36 +1,43 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="RHEA System S.A.">
// Copyright (c) 2017 RHEA System S.A.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("BasicRdl.Tests")]
[assembly: InternalsVisibleTo("CDP4Addin.Tests")]
[assembly: InternalsVisibleTo("CDP4BuiltInRules.Tests")]
[assembly: InternalsVisibleTo("CDP4CategorizedParameterSheetGenerator.Tests")]
[assembly: InternalsVisibleTo("CDP4Common.Tests")]
[assembly: InternalsVisibleTo("CDP4Common.NetCore.Tests")]
[assembly: InternalsVisibleTo("CDP4CommonView.Tests")]
[assembly: InternalsVisibleTo("CDP4Composition.Tests")]
[assembly: InternalsVisibleTo("CDP4Dal.Tests")]
[assembly: InternalsVisibleTo("CDP4IME.Tests")]
[assembly: InternalsVisibleTo("CDP4LogInfo.Tests")]
[assembly: InternalsVisibleTo("CDP4Notes.Tests")]
[assembly: InternalsVisibleTo("CDP4ObjectBrowser.Tests")]
[assembly: InternalsVisibleTo("CDP4OfficeInfrastructure.Tests")]
[assembly: InternalsVisibleTo("CDP4ParameterSheetGenerator.Tests")]
[assembly: InternalsVisibleTo("CDP4PropertyGrid.Tests")]
[assembly: InternalsVisibleTo("CDP4RelationshipEditor.Tests")]
[assembly: InternalsVisibleTo("CDP4ShellDialogsTestFixture.Tests")]
[assembly: InternalsVisibleTo("CDP4SiteDirectory.Tests")]
[assembly: InternalsVisibleTo("CDP4WspDal.Tests")]
[assembly: InternalsVisibleTo("CDP4EngineeringModel.Tests")]
[assembly: InternalsVisibleTo("ExtendedRDL.Tests")]
[assembly: InternalsVisibleTo("ProductTree.Tests")]
[assembly: InternalsVisibleTo("CDP4Requirements.Tests")]
[assembly: InternalsVisibleTo("CDP4ServicesDal.Tests")]
[assembly: InternalsVisibleTo("CDP4JsonSerializer")]
[assembly: InternalsVisibleTo("CDP4OfficeInfrastructure")]
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="RHEA System S.A.">
// Copyright (c) 2017-2018 RHEA System S.A.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("CDP4Common.Tests")]
[assembly: InternalsVisibleTo("CDP4Common.NetCore.Tests")]
[assembly: InternalsVisibleTo("CDP4JsonSerializer")]
[assembly: InternalsVisibleTo("CDP4JsonSerializer.Tests")]
[assembly: InternalsVisibleTo("CDP4JsonSerializer.NetCore.Tests")]
[assembly: InternalsVisibleTo("CDP4Dal.Tests")]
[assembly: InternalsVisibleTo("CDP4Dal.NetCore.Tests")]
[assembly: InternalsVisibleTo("CDP4JsonFileDal.Tests")]
[assembly: InternalsVisibleTo("CDP4JsonFileDal.NetCore.Tests")]
[assembly: InternalsVisibleTo("CDP4ServicesDal.Tests")]
[assembly: InternalsVisibleTo("CDP4ServicesDal.NetCore.Tests")]
[assembly: InternalsVisibleTo("CDP4WspDal.Tests")]
[assembly: InternalsVisibleTo("CDP4WspDal.NetCore.Tests")]

[assembly: InternalsVisibleTo("BasicRdl.Tests")]
[assembly: InternalsVisibleTo("CDP4Addin.Tests")]
[assembly: InternalsVisibleTo("CDP4BuiltInRules.Tests")]
[assembly: InternalsVisibleTo("CDP4CategorizedParameterSheetGenerator.Tests")]
[assembly: InternalsVisibleTo("CDP4CommonView.Tests")]
[assembly: InternalsVisibleTo("CDP4Composition.Tests")]
[assembly: InternalsVisibleTo("CDP4IME.Tests")]
[assembly: InternalsVisibleTo("CDP4LogInfo.Tests")]
[assembly: InternalsVisibleTo("CDP4Notes.Tests")]
[assembly: InternalsVisibleTo("CDP4ObjectBrowser.Tests")]
[assembly: InternalsVisibleTo("CDP4OfficeInfrastructure.Tests")]
[assembly: InternalsVisibleTo("CDP4ParameterSheetGenerator.Tests")]
[assembly: InternalsVisibleTo("CDP4PropertyGrid.Tests")]
[assembly: InternalsVisibleTo("CDP4RelationshipEditor.Tests")]
[assembly: InternalsVisibleTo("CDP4ShellDialogsTestFixture.Tests")]
[assembly: InternalsVisibleTo("CDP4SiteDirectory.Tests")]
[assembly: InternalsVisibleTo("CDP4EngineeringModel.Tests")]
[assembly: InternalsVisibleTo("ProductTree.Tests")]
[assembly: InternalsVisibleTo("CDP4Requirements.Tests")]
[assembly: InternalsVisibleTo("CDP4OfficeInfrastructure")]
[assembly: InternalsVisibleTo("CDP4Tools.Tests")]
Loading

0 comments on commit d83c3b2

Please sign in to comment.