diff --git a/CDP4-SDK.sln b/CDP4-SDK.sln index 48e206845..71c549717 100644 --- a/CDP4-SDK.sln +++ b/CDP4-SDK.sln @@ -1,103 +1,103 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2009 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Common", "CDP4Common\CDP4Common.csproj", "{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Common.Tests", "CDP4Common.Tests\CDP4Common.Tests.csproj", "{850A39B6-BCB6-46D9-B7D7-8CED79302E19}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonSerializer", "CDP4JsonSerializer\CDP4JsonSerializer.csproj", "{A8F3B7A2-DC51-40D7-B886-51174DDDF668}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonSerializer.Tests", "CDP4JsonSerializer.Tests\CDP4JsonSerializer.Tests.csproj", "{CCED2E8F-5072-45B0-B4A4-1200C348E903}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Dal", "CDP4Dal\CDP4Dal.csproj", "{6410A3C1-F166-4B40-91E6-49CC312B968A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Dal.Tests", "CDP4Dal.Tests\CDP4Dal.Tests.csproj", "{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Common.NetCore.Tests", "CDP4Common.NetCore.Tests\CDP4Common.NetCore.Tests.csproj", "{39F6D678-F3EF-458A-9C6B-680F272314D3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonSerializer.NetCore.Tests", "CDP4JsonSerializer.NetCore.Tests\CDP4JsonSerializer.NetCore.Tests.csproj", "{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDP4JsonFileDal", "CDP4JsonFileDal\CDP4JsonFileDal.csproj", "{3CE04A57-83EE-4E31-8AC7-D99628C848E6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDP4JsonFileDal.Tests", "CDP4JsonFileDal.Tests\CDP4JsonFileDal.Tests.csproj", "{81F3A560-BC12-4B2A-B60B-E64533E9AC99}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4ServicesDal", "CDP4ServicesDal\CDP4ServicesDal.csproj", "{6F9030E9-C774-4247-BA84-4CBF288A844D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4ServicesDal.Tests", "CDP4ServicesDal.Tests\CDP4ServicesDal.Tests.csproj", "{2FF7ED2F-F866-40B9-9FCC-D151404242F2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDP4WspDal", "CDP4WspDal\CDP4WspDal.csproj", "{73547666-55AA-4364-9A5E-1A50693D1576}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDP4WspDal.Tests", "CDP4WspDal.Tests\CDP4WspDal.Tests.csproj", "{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {FC2CA84E-242A-4AEB-B00F-312DE0D19E95} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2010 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Common", "CDP4Common\CDP4Common.csproj", "{66BB2677-B6D6-43F2-A56C-884FADF6ABF9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Common.Tests", "CDP4Common.Tests\CDP4Common.Tests.csproj", "{850A39B6-BCB6-46D9-B7D7-8CED79302E19}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonSerializer", "CDP4JsonSerializer\CDP4JsonSerializer.csproj", "{A8F3B7A2-DC51-40D7-B886-51174DDDF668}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonSerializer.Tests", "CDP4JsonSerializer.Tests\CDP4JsonSerializer.Tests.csproj", "{CCED2E8F-5072-45B0-B4A4-1200C348E903}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Dal", "CDP4Dal\CDP4Dal.csproj", "{6410A3C1-F166-4B40-91E6-49CC312B968A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Dal.Tests", "CDP4Dal.Tests\CDP4Dal.Tests.csproj", "{D7EF94D5-1E5A-4D22-8D23-D6737C71CBE1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Common.NetCore.Tests", "CDP4Common.NetCore.Tests\CDP4Common.NetCore.Tests.csproj", "{39F6D678-F3EF-458A-9C6B-680F272314D3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonSerializer.NetCore.Tests", "CDP4JsonSerializer.NetCore.Tests\CDP4JsonSerializer.NetCore.Tests.csproj", "{8C50DC9F-10D4-4BC1-9A49-4FC03AC78767}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonFileDal", "CDP4JsonFileDal\CDP4JsonFileDal.csproj", "{3CE04A57-83EE-4E31-8AC7-D99628C848E6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4JsonFileDal.Tests", "CDP4JsonFileDal.Tests\CDP4JsonFileDal.Tests.csproj", "{81F3A560-BC12-4B2A-B60B-E64533E9AC99}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4ServicesDal", "CDP4ServicesDal\CDP4ServicesDal.csproj", "{6F9030E9-C774-4247-BA84-4CBF288A844D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4ServicesDal.Tests", "CDP4ServicesDal.Tests\CDP4ServicesDal.Tests.csproj", "{2FF7ED2F-F866-40B9-9FCC-D151404242F2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4WspDal", "CDP4WspDal\CDP4WspDal.csproj", "{73547666-55AA-4364-9A5E-1A50693D1576}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4WspDal.Tests", "CDP4WspDal.Tests\CDP4WspDal.Tests.csproj", "{88D4A523-C0DA-49C4-94DE-8E3BF93856BB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88D4A523-C0DA-49C4-94DE-8E3BF93856BB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FC2CA84E-242A-4AEB-B00F-312DE0D19E95} + EndGlobalSection +EndGlobal diff --git a/CDP4Dal.Tests/CDP4Dal.Tests.csproj b/CDP4Dal.Tests/CDP4Dal.Tests.csproj index 828b25781..c5483acbf 100644 --- a/CDP4Dal.Tests/CDP4Dal.Tests.csproj +++ b/CDP4Dal.Tests/CDP4Dal.Tests.csproj @@ -13,7 +13,6 @@ - diff --git a/CDP4Dal.Tests/DAL/DalTestFixture.cs b/CDP4Dal.Tests/DAL/DalTestFixture.cs index 7292a5b40..75721e7d6 100644 --- a/CDP4Dal.Tests/DAL/DalTestFixture.cs +++ b/CDP4Dal.Tests/DAL/DalTestFixture.cs @@ -1,6 +1,6 @@ // -------------------------------------------------------------------------------------------------------------------- // -// Copyright (c) 2016 RHEA S.A. All rights reserved. +// Copyright (c) 2016-2018 RHEA S.A. All rights reserved. // // -------------------------------------------------------------------------------------------------------------------- @@ -12,26 +12,14 @@ namespace CDP4Dal.Tests.DAL using System.Threading.Tasks; using CDP4Common; using CDP4Common.DTO; - using CDP4Common.MetaInfo; using CDP4Dal.Operations; using CDP4Dal.DAL; - using Microsoft.Practices.ServiceLocation; using Moq; using NUnit.Framework; [TestFixture] public class DalTestFixture { - private Mock serviceLocator; - - [SetUp] - public void Setup() - { - this.serviceLocator = new Mock(); - ServiceLocator.SetLocatorProvider(new ServiceLocatorProvider(() => this.serviceLocator.Object)); - this.serviceLocator.Setup(x => x.GetInstance()).Returns(new MetaDataProvider()); - } - [Test] public void VerifyThatQueryRequestContextReturnsExpectedResult() { diff --git a/CDP4Dal.Tests/DalTestFixture.cs b/CDP4Dal.Tests/DalTestFixture.cs index eba164036..2496896c7 100644 --- a/CDP4Dal.Tests/DalTestFixture.cs +++ b/CDP4Dal.Tests/DalTestFixture.cs @@ -1,6 +1,6 @@ // -------------------------------------------------------------------------------------------------------------------- // -// Copyright (c) 2017 RHEA System S.A. +// Copyright (c) 2017-2018 RHEA System S.A. // // -------------------------------------------------------------------------------------------------------------------- @@ -12,12 +12,10 @@ namespace CDP4Dal.Tests using System.Threading.Tasks; using CDP4Common; using CDP4Common.DTO; - using CDP4Common.MetaInfo; using CDP4Dal.Operations; using CDP4Dal.DAL; using Moq; using NUnit.Framework; - using Microsoft.Practices.ServiceLocation; /// /// suite of tests for the abstract class @@ -26,15 +24,11 @@ namespace CDP4Dal.Tests public class DalTestFixture { private Credentials credentials; - private Mock serviceLocator; private string someuri = "http://someuri"; [SetUp] public void SetUp() { - this.serviceLocator = new Mock(); - ServiceLocator.SetLocatorProvider(new ServiceLocatorProvider(() => this.serviceLocator.Object)); - this.serviceLocator.Setup(x => x.GetInstance()).Returns(new MetaDataProvider()); this.credentials = new Credentials("John", "Doe", new Uri(this.someuri)); } diff --git a/CDP4Dal/CDP4Dal.csproj b/CDP4Dal/CDP4Dal.csproj index 9d97d3457..cf139d817 100644 --- a/CDP4Dal/CDP4Dal.csproj +++ b/CDP4Dal/CDP4Dal.csproj @@ -4,7 +4,7 @@ net45;net451;net452;net46;net461;net462;net47 RHEA System S.A. CDP4Dal Community Edition - 1.0.0-rc10 + 1.0.1-rc01 CDP4 Data Access Layer library, a consumer of an ECSS-E-TM-10-25 Annex C API Copyright © RHEA System S.A. Sam, Merlin, Alex, Naron, Patxi @@ -15,7 +15,7 @@ https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition.git CDP CDP4 ECSS-E-TM-10-25 https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE - [Update] to CDP4Common-CE 1.0.0-rc10 + [Remove] CommonServiceLocator dependency @@ -40,7 +40,6 @@ - diff --git a/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj b/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj index 432e735d7..cc977d72a 100644 --- a/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj +++ b/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj @@ -9,9 +9,6 @@ - @@ -27,7 +24,10 @@ + + diff --git a/CDP4JsonFileDal/CDP4JsonFileDal.csproj b/CDP4JsonFileDal/CDP4JsonFileDal.csproj index 849d0ac8c..da0579814 100644 --- a/CDP4JsonFileDal/CDP4JsonFileDal.csproj +++ b/CDP4JsonFileDal/CDP4JsonFileDal.csproj @@ -4,7 +4,7 @@ net45;net451;net452;net46;net461;net462;net47 RHEA System S.A. CDP4JsonFileDal Community Edition - 1.0.0-rc10 + 1.0.1-rc01 CDP4 Json File Dal Plugin Copyright © RHEA System S.A. Sam, Merlin, Alex, Naron @@ -15,7 +15,7 @@ https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition.git CDP CDP4 ECSS-E-TM-10-25 https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE - [Update] to CDP4Dal-CE and CDP4JsonSerializer-CE 1.0.0-rc10 + [Update] to CDP4Dal-CE and CDP4Dal-CE 1.0.1-rc01 @@ -28,7 +28,7 @@ - + + diff --git a/CDP4ServicesDal/CDP4ServicesDal.csproj b/CDP4ServicesDal/CDP4ServicesDal.csproj index b2a64192b..acb64a6cc 100644 --- a/CDP4ServicesDal/CDP4ServicesDal.csproj +++ b/CDP4ServicesDal/CDP4ServicesDal.csproj @@ -4,7 +4,7 @@ net45;net451;net452;net46;net461;net462;net47 RHEA System S.A. CDP4ServicesDal Community Edition - 1.0.0-rc10 + 1.0.1-rc01 CDP4ServicesDal Dal Plugin Copyright © RHEA System S.A. Sam, Merlin, Alex, Naron @@ -15,13 +15,14 @@ https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition.git CDP CDP4 ECSS-E-TM-10-25 https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE - [Update] to CDP4Dal-CE and CDP4JsonSerializer-CE 1.0.0-rc10 + [Update] to CDP4Dal-CE and CDP4Dal-CE 1.0.1-rc01 - + - + + - - + --> diff --git a/CDP4WspDal.Tests/SessionTestFixture.cs b/CDP4WspDal.Tests/SessionTestFixture.cs index 22a52885f..8a62afa20 100644 --- a/CDP4WspDal.Tests/SessionTestFixture.cs +++ b/CDP4WspDal.Tests/SessionTestFixture.cs @@ -17,7 +17,6 @@ namespace CDP4WspDal.Tests using CDP4Common.MetaInfo; using CDP4Dal; using CDP4Dal.DAL; - using Microsoft.Practices.ServiceLocation; using Moq; using NUnit.Framework; diff --git a/CDP4WspDal/CDP4WspDal.csproj b/CDP4WspDal/CDP4WspDal.csproj index e5098a91c..487d9cc20 100644 --- a/CDP4WspDal/CDP4WspDal.csproj +++ b/CDP4WspDal/CDP4WspDal.csproj @@ -4,7 +4,7 @@ net45;net451;net452;net46;net461;net462;net47 RHEA System S.A. CDP4WspDal Community Edition - 1.0.0-rc10 + 1.0.1-rc01 CDP4 WSP Dal Plugin Copyright © RHEA System S.A. Sam, Merlin, Alex, Naron @@ -15,13 +15,13 @@ https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition.git CDP CDP4 ECSS-E-TM-10-25 https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE - [Update] to CDP4Dal-CE and CDP4JsonSerializer-CE 1.0.0-rc10 + [Update] to CDP4Dal-CE and CDP4Dal-CE 1.0.1-rc01 - +