Index: dam clients/DamUI/trunk/src/Dam.sln =================================================================== diff -u -r289 -r290 --- dam clients/DamUI/trunk/src/Dam.sln (.../Dam.sln) (revision 289) +++ dam clients/DamUI/trunk/src/Dam.sln (.../Dam.sln) (revision 290) @@ -30,8 +30,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Piping.Data", "Piping\Data\Deltares.Piping.Data.csproj", "{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}" -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.AssessmentMechanism", "Deltares.AssessmentMechanism\Deltares.AssessmentMechanism.csproj", "{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}" @@ -65,8 +63,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Piping.Tests", "Piping\Tests\Deltares.Piping.Tests.csproj", "{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}" -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}" @@ -81,10 +77,6 @@ Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Debug|x86.ActiveCfg = Debug|x86 - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Debug|x86.Build.0 = Debug|x86 - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Release|x86.ActiveCfg = Release|x86 - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Release|x86.Build.0 = Release|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.ActiveCfg = Debug|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.Build.0 = Debug|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.ActiveCfg = Release|x86 @@ -137,10 +129,6 @@ {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 - {49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Debug|x86.ActiveCfg = Debug|x86 - {49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Debug|x86.Build.0 = Debug|x86 - {49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Release|x86.ActiveCfg = Release|x86 - {49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.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 @@ -164,7 +152,6 @@ {7A9F4AF0-9F1B-4C80-83C0-252B5CED05A6} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958} {6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958} {62CC2363-893F-4ECD-BCD6-AA7150AD6918} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9} - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD} = {31A32A36-649A-41A8-9F43-6A6193C04770} {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770} {AABFB557-DC0C-41EF-9B41-B84EEBF541BB} = {31A32A36-649A-41A8-9F43-6A6193C04770} {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770} @@ -178,7 +165,6 @@ {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} - {49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81} = {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} Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj =================================================================== diff -u -r287 -r290 --- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 287) +++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 290) @@ -209,10 +209,6 @@ {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} Deltares.Maps - - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD} - Deltares.Piping.Data - {F1CD9620-15CF-41F8-AF70-5AE004A50F60} Deltares.Dam.Data Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj =================================================================== diff -u -r289 -r290 --- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 289) +++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 290) @@ -508,10 +508,6 @@ {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} Deltares.Maps - - {9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD} - Deltares.Piping.Data - Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingCalculationException.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/CalcDlls/DAM Piping.bbnet'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/TestPipingDAMBBNDll.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Index: dam clients/DamUI/trunk/src/Piping/Data/CalcDlls/MPipingCalc2.dll =================================================================== diff -u -r236 -r290 Binary files differ Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingConstants.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingDAMInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingDAMBBNDll.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/TestPipingModel2Calculation.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingDAMStructs.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: dam clients/DamUI/trunk/src/Piping/Data/CalcDlls/DGSDAMPipingBBN.dll =================================================================== diff -u -r236 -r290 Binary files differ Index: dam clients/DamUI/trunk/src/Piping/Data/CalcDlls/BayesBuilder.dll =================================================================== diff -u -r236 -r290 Binary files differ Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/Deltares.Piping.Data.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingDAMAnalysis.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingCalc2Dll.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/TestPipingModel3Calculation.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: dam clients/DamUI/trunk/src/Piping/Data/CalcDlls/MPipingCalc3.dll =================================================================== diff -u -r236 -r290 Binary files differ Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingModel3Data.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/Deltares.Piping.Tests.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Tests/TestPipingDAM.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingCalc3Dll.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingCommonData.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingModel2Calculation.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingModel2Data.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 290 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Piping/Data/PipingModel3Calculation.cs'. Fisheye: No comparison available. Pass `N' to diff?