Index: DamClients/DamUI/branches/DamUI 18.1/src/Dam.sln =================================================================== diff -u -r1733 -r1734 --- DamClients/DamUI/branches/DamUI 18.1/src/Dam.sln (.../DamUI 18.1 obsolete/src/Dam.sln) (revision 1733) +++ DamClients/DamUI/branches/DamUI 18.1/src/Dam.sln (.../DamUI 18.1/src/Dam.sln) (revision 1734) @@ -32,16 +32,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LumenWorks.Framework.IO", "Tools\LumenWorks.Framework.IO\LumenWorks.Framework.IO.csproj", "{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}" - ProjectSection(ProjectDependencies) = postProject - {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Data", "Dam\Data\Deltares.Dam.Data.csproj", "{F1CD9620-15CF-41F8-AF70-5AE004A50F60}" - ProjectSection(ProjectDependencies) = postProject - {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D4B66CA4-73D2-40CF-B3ED-9D473ABA34EE}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config @@ -84,11 +74,6 @@ {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}" - ProjectSection(ProjectDependencies) = postProject - {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsvToDamxConverter", "Dam\Tools\CsvToDamxConverter\CsvToDamxConverter.csproj", "{D8457286-3BD4-49FB-9FCB-22D7CB662F57}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoXY2LatLong", "Dam\Tools\GeoXY2LatLong\GeoXY2LatLong.csproj", "{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}" @@ -102,6 +87,22 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Version", "Deltares.Dam.Version\Deltares.Dam.Version.csproj", "{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}" + ProjectSection(ProjectDependencies) = postProject + {48691761-637B-4EFF-A04C-2047E5FA9843} = {48691761-637B-4EFF-A04C-2047E5FA9843} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Data", "DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj", "{F1CD9620-15CF-41F8-AF70-5AE004A50F60}" + ProjectSection(ProjectDependencies) = postProject + {48691761-637B-4EFF-A04C-2047E5FA9843} = {48691761-637B-4EFF-A04C-2047E5FA9843} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "DamClientsLibrary\Deltares.Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DamClientsLibrary", "DamClientsLibrary", "{F6A85256-50BA-4E97-8E3C-D8D488DFAF44}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamClientsLibrary.Version", "DamClientsLibrary\Deltares.DamClientsLibrary.Version\Deltares.DamClientsLibrary.Version.csproj", "{48691761-637B-4EFF-A04C-2047E5FA9843}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -112,14 +113,6 @@ {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.Build.0 = Debug|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.ActiveCfg = Release|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.Build.0 = Release|x86 - {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86 - {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86 - {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86 - {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.Build.0 = Release|x86 - {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.ActiveCfg = Debug|x86 - {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86 - {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86 - {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86 {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.ActiveCfg = Debug|x86 {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.Build.0 = Debug|x86 {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Release|x86.ActiveCfg = Release|x86 @@ -148,10 +141,6 @@ {15503BE5-7148-4DA6-BDD0-5880266E79D4}.Debug|x86.Build.0 = Debug|x86 {15503BE5-7148-4DA6-BDD0-5880266E79D4}.Release|x86.ActiveCfg = Release|x86 {15503BE5-7148-4DA6-BDD0-5880266E79D4}.Release|x86.Build.0 = Release|x86 - {E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86 - {E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86 - {E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86 - {E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86 {D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.ActiveCfg = Debug|x86 {D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.Build.0 = Debug|x86 {D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Release|x86.ActiveCfg = Release|x86 @@ -170,6 +159,22 @@ {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Debug|x86.Build.0 = Debug|x86 {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.ActiveCfg = Release|x86 {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.Build.0 = Release|x86 + {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86 + {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86 + {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86 + {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.Build.0 = Release|x86 + {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.ActiveCfg = Debug|x86 + {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86 + {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86 + {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86 + {E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86 + {E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86 + {E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86 + {E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86 + {48691761-637B-4EFF-A04C-2047E5FA9843}.Debug|x86.ActiveCfg = Debug|x86 + {48691761-637B-4EFF-A04C-2047E5FA9843}.Debug|x86.Build.0 = Debug|x86 + {48691761-637B-4EFF-A04C-2047E5FA9843}.Release|x86.ActiveCfg = Release|x86 + {48691761-637B-4EFF-A04C-2047E5FA9843}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -180,20 +185,22 @@ {6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958} {62CC2363-893F-4ECD-BCD6-AA7150AD6918} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9} {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770} - {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770} - {F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {31A32A36-649A-41A8-9F43-6A6193C04770} {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC} {03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8} {CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} {3929C2AB-5F5B-40A1-8D77-6303AEE7976B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} {D092C06D-9CE6-48CF-8453-637FCCE8B371} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} {D312A703-F6CF-4BEC-B5C5-4E9C161D2010} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} {15503BE5-7148-4DA6-BDD0-5880266E79D4} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} - {E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} {D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08} {2C1BFE67-A106-4926-BA5A-0374EA6B99B6} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08} {5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA} = {BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549} {9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} {E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {31A32A36-649A-41A8-9F43-6A6193C04770} + {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44} + {F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44} + {E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} + {F6A85256-50BA-4E97-8E3C-D8D488DFAF44} = {31A32A36-649A-41A8-9F43-6A6193C04770} + {48691761-637B-4EFF-A04C-2047E5FA9843} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44} EndGlobalSection EndGlobal