Index: src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj
===================================================================
diff -u -r1084 -r1101
--- src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 1084)
+++ src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 1101)
@@ -1,37 +1,25 @@
-
-
-
-
-
+
- Debug
- AnyCPU
- {7FA5B2F2-3FEE-4706-908C-68BA03FDF084}
- Library
- Properties
- Deltares.DSoilModel.Data.Tests
- Deltares.DSoilModel.Data.Tests
- v4.8
- 512
-
+ Debug;Release
+ AnyCPU;x86
-
- x86
- ..\bin\Debug\
- false
-
-
- x86
- ..\bin\Release\
- false
-
+
+
+
+
+
+
+
+
+
+
+
+
- False
..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll
- False
..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll
@@ -50,174 +38,23 @@
..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll
- ..\..\lib\Deltares\DslGeo\Deltares.Standard.dll
+ ..\..\lib\Deltares\DslCore\Deltares.Standard.dll
..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.dll
+
+ ..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Forms.Maps.dll
+
..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll
..\..\lib\Deltares\DslCore\Deltares.Standard.TestUtils.dll
-
- ..\packages\CompareNETObjects.3.03.0.0\lib\net40\KellermanSoftware.Compare-NET-Objects.dll
- True
-
-
-
- ..\packages\NUnit.4.1.0\lib\net462\nunit.framework.dll
-
-
- ..\packages\NUnit.4.1.0\lib\net462\nunit.framework.legacy.dll
-
-
-
-
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
-
-
- ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
-
-
-
-
-
-
-
-
-
-
+
+
-
-
- Copying.GPL.licenseheader
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {37BC4D84-386E-425C-967B-CCF83E48A5F3}
- Deltares.DSoilModel.Data
-
-
- {99BF886D-E4BD-4298-960D-25F31C324395}
- Deltares.DSoilModel.Forms
-
-
-
-
-
-
-
-
-
-
-
- Always
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.
-
-
-
-
-
-
\ No newline at end of file
+
Index: src/build/Test.targets
===================================================================
diff -u
--- src/build/Test.targets (revision 0)
+++ src/build/Test.targets (revision 1101)
@@ -0,0 +1,22 @@
+
+
+
+ bin\$(Configuration)\
+ $(OutputPath)
+ False
+ UnitTest
+
+
+
+ 4.2.2
+
+
+ 4.6.0
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
\ No newline at end of file
Fisheye: Tag 1101 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Data/Properties/AssemblyInfo.cs.svn'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1101 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Application/Properties/AssemblyInfo.cs.svn'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs
===================================================================
diff -u -r1080 -r1101
--- src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs (.../SosSoilProfilesImporterTests.cs) (revision 1080)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs (.../SosSoilProfilesImporterTests.cs) (revision 1101)
@@ -281,7 +281,7 @@
private string GetTestFilesPath()
{
- return Path.GetFullPath(@"..\..\Deltares.DSoilModel.Data.Tests\TestFiles");
+ return Path.GetFullPath(@"..\..\..\Deltares.DSoilModel.Data.Tests\TestFiles");
}
}
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs
===================================================================
diff -u -r1080 -r1101
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs (.../DSoilModelSegmentGeometryEditorTests.cs) (revision 1080)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs (.../DSoilModelSegmentGeometryEditorTests.cs) (revision 1101)
@@ -42,6 +42,8 @@
dsmGeometryEditor.Dispose();
dsmGeometryEditor = null;
BindSupport.ClearCaches();
+ extraGeometryEditor.Dispose();
+ mainForm.Dispose();
}
private SoilProfile2D CreateSoilProfile2D()
Index: src/build/Source.targets
===================================================================
diff -u
--- src/build/Source.targets (revision 0)
+++ src/build/Source.targets (revision 1101)
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs
===================================================================
diff -u -r1080 -r1101
--- src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs (.../SosSoilLayer1DTest.cs) (revision 1080)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs (.../SosSoilLayer1DTest.cs) (revision 1101)
@@ -38,7 +38,7 @@
{
internal class SosSoilLayer1DTest
{
- private const string TestDataFolder = @"..\..\Deltares.DSoilModel.Data.Tests\TestFiles";
+ private const string TestDataFolder = @"..\..\..\Deltares.DSoilModel.Data.Tests\TestFiles";
private const string TestOutputFolder = TestDataFolder + @"SoilModelDatabaseTest\";
private bool oldIsDataEventPublishStopped;
private LanguageType oldLanguage;
@@ -158,7 +158,7 @@
public void PerformanceOfReadingWtiSosData()
{
// purpose of this test was to measure and improve the database performance while working on issue DSB-264
- string fileName = Path.Combine(@"..\..\..\data", @"D-Soil Model\SOS-data", "SosDatabase.soil");
+ string fileName = Path.Combine(@"..\..\..\..\data", @"D-Soil Model\SOS-data", "SosDatabase.soil");
var timer = new Stopwatch();
var database = new SoilModelDatabase();
@@ -209,7 +209,7 @@
// purpose here is to convert the WTI_SOS from CSV/SHP to .Soil format in a script, instead of having to use the D-SoilModel GUI for this
// generate a .soil file containing the complete Wti SOS, and compare the input / output
- var sosFolder = Path.Combine(@"..\..\..\data", @"D-Soil Model\SOS-data");
+ var sosFolder = Path.Combine(@"..\..\..\..\data", @"D-Soil Model\SOS-data");
// import SOS data
var project = new DSoilModelProject();
Fisheye: Tag 1101 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Data.Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1101 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs
===================================================================
diff -u -r1080 -r1101
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs (.../DSoilModelProjectTest.cs) (revision 1080)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs (.../DSoilModelProjectTest.cs) (revision 1101)
@@ -223,11 +223,11 @@
public void TestCaseSensitivityOfImportedSoilNames()
{
var project = new DSoilModelProject();
- project.ReadSoilsFromDatabase(@"..\..\..\data\TestData\OnlyZand.mdb");
+ project.ReadSoilsFromDatabase(@"..\..\..\..\data\TestData\OnlyZand.mdb");
ClassicAssert.AreEqual("Zand", project.Soils.Soils[0].Name);
project.Soils.Soils[0].Name = "zand";
- project.ReadSoilsFromDatabase(@"..\..\..\data\TestData\OnlyZand.mdb");
+ project.ReadSoilsFromDatabase(@"..\..\..\..\data\TestData\OnlyZand.mdb");
// soil names should not be case sensitive during import
ClassicAssert.AreEqual(1, project.Soils.Soils.Count);
@@ -236,7 +236,7 @@
[Test]
public void TestLinkCptsAndBoringsToNearestSoilSegment()
{
- var project = (DSoilModelProject) DSoilModelIO.OpenSoilDatabase(@"..\..\..\data\TestData\SosDataPlusBorings.soil");
+ var project = (DSoilModelProject) DSoilModelIO.OpenSoilDatabase(@"..\..\..\..\data\TestData\SosDataPlusBorings.soil");
var selection = new List