Index: DamClients/DamUI/trunk/src/Dam/Tests/packages.config
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/packages.config (.../packages.config) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/packages.config (.../packages.config) (revision 1498)
@@ -22,11 +22,5 @@
All rights reserved.
-->
-
-
-
-
-
-
\ No newline at end of file
Fisheye: Tag 1498 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Data/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/TestResultsWriter.cs
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/TestResultsWriter.cs (.../TestResultsWriter.cs) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/TestResultsWriter.cs (.../TestResultsWriter.cs) (revision 1498)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Deltares.Dam.Data;
Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj
===================================================================
diff -u -r1467 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj (.../CsvToDamxConverter.csproj) (revision 1467)
+++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj (.../CsvToDamxConverter.csproj) (revision 1498)
@@ -61,9 +61,7 @@
-
-
@@ -88,9 +86,6 @@
Copying.GPL.licenseheader
-
- Designer
-
SettingsSingleFileGenerator
Settings.Designer.cs
Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r904 -r1498
--- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 904)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 1498)
@@ -130,10 +130,6 @@
False
..\..\..\lib\DotSpatial\DotSpatial.Projections.Forms.dll
-
- False
- ..\..\..\lib\DotSpatial\DotSpatial.Serialization.dll
-
False
..\..\..\lib\DotSpatial\DotSpatial.Symbology.dll
@@ -142,10 +138,6 @@
False
..\..\..\lib\DotSpatial\DotSpatial.Topology.dll
-
- False
- ..\..\..\lib\DotSpatial.BrutileLayer\SmartThreadPool.dll
-
3.5
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r1467 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 1467)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 1498)
@@ -66,17 +66,10 @@
False
..\..\..\lib\DSL-Core\Deltares.Standard.dll
-
- ..\..\..\lib\DSL-Core\Deltares.Standard.TestUtils.dll
-
False
..\..\..\lib\DotSpatial\DotSpatial.Data.dll
-
- False
- ..\..\..\lib\DotSpatial\DotSpatial.Mono.dll
-
False
..\..\..\lib\DotSpatial\DotSpatial.Topology.dll
Index: DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r904 -r1498
--- DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj (.../Deltares.Dam.Application.csproj) (revision 904)
+++ DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj (.../Deltares.Dam.Application.csproj) (revision 1498)
@@ -60,37 +60,25 @@
false
-
+
False
- ..\..\..\lib\Authorization\x86\Deltares.Authorization.dll
-
-
- False
- ..\..\..\lib\DSL-Geo\Deltares.Geometry.dll
-
-
- False
..\..\..\lib\DSL-FormsGeo\Deltares.Geometry.Forms.dll
-
+
False
- ..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll
-
-
- False
..\..\..\lib\DSL-FormsGeo\Deltares.Geotechnics.Forms.dll
-
+
False
..\..\..\lib\DSL-Core\Deltares.Standard.dll
-
+
False
- ..\..\..\lib\DSL-FormsStandard\Deltares.Standard.Forms.dll
+ ..\..\..\lib\DSL-FormsGeo\Deltares.Standard.Forms.dll
-
- False
+
..\..\..\lib\DSL-FormsStandard\Deltares.Standard.Forms.DExpress.dll
+ False
Index: DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r1208 -r1498
--- DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 1208)
+++ DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 1498)
@@ -82,11 +82,12 @@
False
..\..\..\lib\Authorization\x86\Deltares.Authorization.dll
-
+
False
..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll
-
+
+ False
..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll
@@ -117,10 +118,6 @@
False
..\..\..\lib\DSL-Core\Deltares.Standard.dll
-
- False
- ..\..\..\lib\DotSpatial\DotSpatial.Controls.dll
-
False
..\..\..\lib\DotSpatial\DotSpatial.Data.dll
@@ -129,14 +126,6 @@
False
..\..\..\lib\DotSpatial\DotSpatial.Projections.dll
-
- False
- ..\..\..\lib\DotSpatial\DotSpatial.Serialization.dll
-
-
- False
- ..\..\..\lib\DotSpatial\DotSpatial.Symbology.dll
-
False
..\..\..\lib\DotSpatial\DotSpatial.Topology.dll
@@ -396,7 +385,6 @@
Designer
-
SettingsSingleFileGenerator
Settings.Designer.cs
Index: DamClients/DamUI/trunk/src/Dam/Forms/app.config
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Forms/app.config (.../app.config) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Forms/app.config (.../app.config) (revision 1498)
@@ -1,4 +1,4 @@
-
+
-
+
@@ -39,6 +61,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs (.../branches/CalcualtionIncluded/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs (.../trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs) (revision 1498)
@@ -1,15 +1,25 @@
-//-----------------------------------------------------------------------
-//
-// Copyright (c) 2011 Deltares. All rights reserved.
-//
-// Tom The
-// tom.the@deltares.nl
-// 23-03-2011
-// Test for importing MGeobase data in DataPlugin
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
using Deltares.Dam.Data;
-using Deltares.Soilbase;
namespace Deltares.Dam.Tests
{
Fisheye: Tag 1498 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tests/SoilGeometryTests.cs
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/SoilGeometryTests.cs (.../SoilGeometryTests.cs) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/SoilGeometryTests.cs (.../SoilGeometryTests.cs) (revision 1498)
@@ -30,7 +30,6 @@
using System.Text;
using NUnit.Framework;
using Deltares.Dam.Data;
- using Deltares.Soilbase;
[TestFixture]
public class SoilGeometryTests
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.BenchmarkTests.csproj
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.BenchmarkTests.csproj (.../Deltares.Dam.BenchmarkTests.csproj) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.BenchmarkTests.csproj (.../Deltares.Dam.BenchmarkTests.csproj) (revision 1498)
@@ -134,10 +134,6 @@
False
..\..\..\lib\DSL-Core\Deltares.Standard.dll
-
- False
- ..\..\..\lib\DSL-Core\Deltares.Standard.TestUtils.dll
-
False
..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll
Index: DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj (.../branches/CalcualtionIncluded/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj (.../trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj) (revision 1498)
@@ -10,7 +10,7 @@
Properties
GeoXY2LatLong
GeoXY2LatLong
- v4.0
+ v4.5
512
@@ -25,6 +25,7 @@
full
x86
prompt
+ false
bin\x86\Release\
@@ -33,21 +34,13 @@
pdbonly
x86
prompt
+ false
-
3.5
-
- 3.5
-
-
- 3.5
-
-
-
@@ -56,6 +49,9 @@
+
+ Copying.GPL.licenseheader
+
PreserveNewest
Index: DamClients/DamUI/trunk/src/Dam/Tests/App.config
===================================================================
diff -u -r875 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/App.config (.../App.config) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/App.config (.../App.config) (revision 1498)
@@ -1,4 +1,4 @@
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fisheye: Tag 1498 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Maps/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r1467 -r1498
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 1467)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 1498)
@@ -216,10 +216,6 @@
{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}
Deltares.Dam.Forms
-
- {3929c2ab-5f5b-40a1-8d77-6303aee7976b}
- Deltares.Dam.IntegrationTests
-
{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}
Deltares.Dam.TestHelper
Fisheye: Tag 1498 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?