Skip to content

Commit

Permalink
[Remove] CommonServiceLocator dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
sam.gerene committed Jan 6, 2018
1 parent c9f22a5 commit 7e73218
Show file tree
Hide file tree
Showing 12 changed files with 129 additions and 147 deletions.
206 changes: 103 additions & 103 deletions CDP4-SDK.sln
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion CDP4Dal.Tests/CDP4Dal.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommonServiceLocator" version="1.3" />
<PackageReference Include="NLog" Version="4.5.0-rc03" />
<PackageReference Include="Rx-Core" version="2.2.5" />
<PackageReference Include="Rx-Interfaces" version="2.2.5" />
Expand Down
14 changes: 1 addition & 13 deletions CDP4Dal.Tests/DAL/DalTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="WspDal.cs" company="RHEA System S.A.">
// Copyright (c) 2016 RHEA S.A. All rights reserved.
// Copyright (c) 2016-2018 RHEA S.A. All rights reserved.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

Expand All @@ -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<IServiceLocator> serviceLocator;

[SetUp]
public void Setup()
{
this.serviceLocator = new Mock<IServiceLocator>();
ServiceLocator.SetLocatorProvider(new ServiceLocatorProvider(() => this.serviceLocator.Object));
this.serviceLocator.Setup(x => x.GetInstance<IMetaDataProvider>()).Returns(new MetaDataProvider());
}

[Test]
public void VerifyThatQueryRequestContextReturnsExpectedResult()
{
Expand Down
8 changes: 1 addition & 7 deletions CDP4Dal.Tests/DalTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DalTestFixture.cs" company="RHEA System S.A.">
// Copyright (c) 2017 RHEA System S.A.
// Copyright (c) 2017-2018 RHEA System S.A.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

Expand All @@ -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;

/// <summary>
/// suite of tests for the abstract <see cref="Dal"/> class
Expand All @@ -26,15 +24,11 @@ namespace CDP4Dal.Tests
public class DalTestFixture
{
private Credentials credentials;
private Mock<IServiceLocator> serviceLocator;
private string someuri = "http://someuri";

[SetUp]
public void SetUp()
{
this.serviceLocator = new Mock<IServiceLocator>();
ServiceLocator.SetLocatorProvider(new ServiceLocatorProvider(() => this.serviceLocator.Object));
this.serviceLocator.Setup(x => x.GetInstance<IMetaDataProvider>()).Returns(new MetaDataProvider());
this.credentials = new Credentials("John", "Doe", new Uri(this.someuri));
}

Expand Down
5 changes: 2 additions & 3 deletions CDP4Dal/CDP4Dal.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>net45;net451;net452;net46;net461;net462;net47</TargetFrameworks>
<Company>RHEA System S.A.</Company>
<Title>CDP4Dal Community Edition</Title>
<Version>1.0.0-rc10</Version>
<Version>1.0.1-rc01</Version>
<Description>CDP4 Data Access Layer library, a consumer of an ECSS-E-TM-10-25 Annex C API</Description>
<Copyright>Copyright © RHEA System S.A.</Copyright>
<Authors>Sam, Merlin, Alex, Naron, Patxi</Authors>
Expand All @@ -15,7 +15,7 @@
<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>[Update] to CDP4Common-CE 1.0.0-rc10</releaseNotes>
<releaseNotes>[Remove] CommonServiceLocator dependency</releaseNotes>
</PropertyGroup>

<ItemGroup>
Expand All @@ -40,7 +40,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommonServiceLocator" version="1.3" />
<PackageReference Include="Rx-Core" version="2.2.5" />
<PackageReference Include="Rx-Interfaces" version="2.2.5" />
<PackageReference Include="Rx-Linq" version="2.2.5" />
Expand Down
Loading

0 comments on commit 7e73218

Please sign in to comment.