Riskeer / Application / Ringtoets / src

Application.Ringtoets.Storage

Clone Tools

Stats

Commits this week: 0
Total Committers: 9
Last Commit: 26 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 02 Feb 2018
10:05 am

Dennis Tang <dennis.tang@deltares.nl>

Incorporated comments review 2453: - Adjusted .gitignore file - Moved files to correct locations - Added ArgumentNullExceptions when missing - Simplified tests - Updated XMLDoc

WTI-1579

Options
    • -1
    • +1
    ./Application.Ringtoets.Storage.csproj
    • -15
    • +5
    ./Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensions.cs
    • -15
    • +5
    ./Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensions.cs
    • -52
    • +0
    ./Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensions.cs
    • -8
    • +20
    ./Create/HydraulicBoundaryLocationCreateExtensions.cs
    • -36
    • +19
    ./Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
    • -0
    • +59
    ./Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensions.cs
    • -0
    • +7
    ./Read/HydraulicLocationOutputEntityReadExtensions.cs
  9. … 5 more files in changeset.
8:30 am

Robert Tangerman <robert.tangerman@deltares.nl>

Removed derived output from storage. WTI-1591

Options
    • -7
    • +1
    ./Application.Ringtoets.Storage.csproj
    • -2
    • +1
    ./Create/StructuresOutputCreateExtensions.cs
    • -4
    • +0
    ./DbContext/ClosingStructuresOutputEntity.cs
    • -4
    • +0
    ./DbContext/GrassCoverErosionInwardsOutputEntity.cs
    • -4
    • +0
    ./DbContext/HeightStructuresOutputEntity.cs
    • -54
    • +0
    ./DbContext/IProbabilityAssessmentOutputEntity.cs
    • -0
    • +34
    ./DbContext/IStructuresOutputEntity.cs
    • -4
    • +0
    ./DbContext/MacroStabilityInwardsCalculationEntity.cs
    • -46
    • +0
    ./DbContext/MacroStabilityInwardsSemiProbabilisticOutputEntity.cs
    • -2
    • +2
    ./DbContext/PartialClosingStructuresOutputEntity.cs
    • -2
    • +2
    ./DbContext/PartialHeightStructuresOutputEntity.cs
    • -2
    • +0
    ./DbContext/PartialRingtoetsEntities.cs
    • -2
    • +2
    ./DbContext/PartialStabilityPointStructuresOutputEntity.cs
    • -4
    • +0
    ./DbContext/PipingCalculationEntity.cs
    • -55
    • +0
    ./DbContext/PipingSemiProbabilisticOutputEntity.cs
  16. … 17 more files in changeset.
Thursday 01 Feb 2018
2:05 pm

Carlos Lubbers

Remove redundant imports and targets WTI-1587

Options
    • -3
    • +0
    ./Application.Ringtoets.Storage.csproj
  2. … 5 more files in changeset.
Wednesday 31 Jan 2018
2:26 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed read and create extensions for ProbabilityAssessmentOutput. WTI-1590

Options
    • -2
    • +0
    ./Application.Ringtoets.Storage.csproj
    • -52
    • +0
    ./Create/ProbabilityAssessmentOutputCreateExtensions.cs
    • -49
    • +0
    ./Read/ProbabilityAssessmentOutputEntityReadExtensions.cs
  4. … 3 more files in changeset.
2:24 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed ProbabilityAssessmentOutput from StructuresOutput constructor. WTI-1590

Options
    • -1
    • +1
    ./Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs
    • -1
    • +1
    ./Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs
    • -1
    • +1
    ./Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs
  4. … 17 more files in changeset.
2:05 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Adapted storage extensions for not saving the probabilityAssessmentOutput. WTI-1590

Options
    • -2
    • +4
    ./Create/StructuresOutputCreateExtensions.cs
  2. … 3 more files in changeset.
11:18 am

Robert Tangerman <robert.tangerman@deltares.nl>

Removed height stability point specific section result. WTI-1590

Options
    • -2
    • +3
    ./Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs
    • -4
    • +7
    ./Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs
    • -1
    • +2
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -5
    • +7
    ./Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs
  5. … 30 more files in changeset.
8:24 am

Robert Tangerman <robert.tangerman@deltares.nl>

Removed height structures specific section result. WTI-1590

Options
    • -2
    • +3
    ./Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
    • -3
    • +6
    ./Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensions.cs
    • -1
    • +1
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -5
    • +7
    ./Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs
  5. … 28 more files in changeset.
Tuesday 30 Jan 2018
4:45 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed closing structures specific section result. WTI-1590

Options
    • -2
    • +3
    ./Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs
    • -3
    • +4
    ./Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs
    • -5
    • +6
    ./Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs
    • -1
    • +2
    ./Read/FailureMechanismEntityReadExtensions.cs
  5. … 30 more files in changeset.
4:45 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed closing structures specific section result. WTI-1590

Options
    • -2
    • +3
    ./Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs
    • -3
    • +4
    ./Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs
    • -5
    • +6
    ./Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs
    • -1
    • +2
    ./Read/FailureMechanismEntityReadExtensions.cs
  5. … 30 more files in changeset.
4:40 pm

Carlos Lubbers

Add delta L property to storage WTI-1531

Options
    • -0
    • +1
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +2
    ./Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs
    • -1
    • +22
    ./DbContext/RingtoetsEntities.Designer.cs
    • -1
    • +4
    ./DbContext/RingtoetsEntities.edmx
    • -91
    • +91
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -0
    • +1
    ./DbContext/WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs
    • -0
    • +7
    ./Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +7
    ./Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensions.cs
    • -0
    • +1
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -1
    • +6
    ./Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +6
    ./Read/GrassCoverErosionOutwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -0
    • +7
    ./Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs
    • -2
    • +3
    ./Read/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +1
    ./Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs
    • -1
    • +1
    ./Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs
  16. … 27 more files in changeset.
4:40 pm

Carlos Lubbers

Add delta L property to storage WTI-1531

Options
    • -0
    • +1
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +2
    ./Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs
    • -1
    • +22
    ./DbContext/RingtoetsEntities.Designer.cs
    • -1
    • +4
    ./DbContext/RingtoetsEntities.edmx
    • -91
    • +91
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -0
    • +1
    ./DbContext/WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs
    • -0
    • +7
    ./Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +7
    ./Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensions.cs
    • -0
    • +1
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -1
    • +6
    ./Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +6
    ./Read/GrassCoverErosionOutwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -0
    • +7
    ./Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs
    • -2
    • +3
    ./Read/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +1
    ./Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs
    • -1
    • +1
    ./Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs
  16. … 27 more files in changeset.
4:23 pm

Dennis Tang <dennis.tang@deltares.nl>

Updated mappings Create and Read Extensions for HBL calculations: - Entity framework maps the entities in a reverse order on the foreign keys when mapping

WTI-1579

Options
    • -8
    • +8
    ./Create/HydraulicBoundaryLocationCreateExtensions.cs
    • -8
    • +8
    ./Read/HydraulicLocationEntityReadExtensions.cs
  3. … 2 more files in changeset.
2:21 pm

Dennis Tang <dennis.tang@deltares.nl>

Merge branch '1579'

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd

# Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

Options
    • -3
    • +5
    ./Application.Ringtoets.Storage.csproj
    • -74
    • +74
    ./DbContext/AssessmentSectionEntity.cs
    • -55
    • +55
    ./DbContext/BackgroundDataEntity.cs
    • -41
    • +41
    ./DbContext/BackgroundDataMetaEntity.cs
    • -93
    • +93
    ./DbContext/CalculationGroupEntity.cs
    • -80
    • +80
    ./DbContext/ClosingStructureEntity.cs
    • -101
    • +101
    ./DbContext/ClosingStructuresCalculationEntity.cs
    • -42
    • +42
    ./DbContext/ClosingStructuresFailureMechanismMetaEntity.cs
    • -46
    • +46
    ./DbContext/ClosingStructuresOutputEntity.cs
    • -43
    • +43
    ./DbContext/ClosingStructuresSectionResultEntity.cs
    • -63
    • +63
    ./DbContext/DikeProfileEntity.cs
    • -40
    • +40
    ./DbContext/DuneErosionFailureMechanismMetaEntity.cs
    • -42
    • +42
    ./DbContext/DuneErosionSectionResultEntity.cs
    • -60
    • +60
    ./DbContext/DuneLocationEntity.cs
    • -47
    • +47
    ./DbContext/DuneLocationOutputEntity.cs
  16. … 93 more files in changeset.
8:51 am

Dennis Tang <dennis.tang@deltares.nl>

Updated database design: - Renamed PK of HydraulicLocationOutputEntity to match with the current naming conventions -- Updated migration script and integration test - Updated triggers of the HydraulicLocationEntity to match with the current naming convention and exhibit the correct behaviour

WTI-1579

Options
    • -1
    • +1
    ./DbContext/HydraulicLocationOutputEntity.cs
    • -5
    • +5
    ./DbContext/RingtoetsEntities.edmx
    • -83
    • +83
    ./DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Ringtoets.rtd
  5. … 6 more files in changeset.
Monday 29 Jan 2018
2:48 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Added calculated reliability to structures output data model. WTI-1590

Options
    • -1
    • +1
    ./Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs
    • -1
    • +1
    ./Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs
    • -1
    • +1
    ./Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs
  4. … 9 more files in changeset.
1:09 pm

Carlos Lubbers

Adapt storage with the N parameter for the Piping Structure failure mechanism WTI-1531

Options
    • -1
    • +4
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +12
    ./Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs
    • -0
    • +4
    ./DbContext/FailureMechanismEntity.cs
    • -0
    • +1
    ./DbContext/PartialRingtoetsEntities.cs
    • -0
    • +41
    ./DbContext/PipingStructureFailureMechanismMetaEntity.cs
    • -1
    • +2
    ./DbContext/RingtoetsEntities.Context.cs
    • -25
    • +86
    ./DbContext/RingtoetsEntities.edmx
    • -92
    • +94
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -0
    • +35
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +56
    ./Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs
    • -56
    • +0
    ./Read/PipingStructures/PipingStructureSectionResultEntityReadExtensions.cs
    • binary
    ./Ringtoets.rtd
  13. … 10 more files in changeset.
8:11 am

Robert Tangerman <robert.tangerman@deltares.nl>

Removed semi probabilistic output property from overtopping output. WTI-1589

Options
    • -4
    • +0
    ./Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs
    • -1
    • +0
    ./Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs
  3. … 17 more files in changeset.
Friday 26 Jan 2018
5:00 pm

Carlos Lubbers

Adapt storage to include the macro stability outwards probability assessment input WTI-1531

Options
    • -2
    • +6
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./Create/AssessmentSectionCreateExtensions.cs
    • -3
    • +15
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs
    • -6
    • +6
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
    • -0
    • +4
    ./DbContext/FailureMechanismEntity.cs
    • -2
    • +2
    ./DbContext/FailureMechanismSectionEntity.cs
    • -0
    • +41
    ./DbContext/MacroStabilityOutwardsFailureMechanismMetaEntity.cs
    • -0
    • +43
    ./DbContext/MacroStabilityOutwardsSectionResultEntity.cs
    • -43
    • +0
    ./DbContext/MacrostabilityOutwardsSectionResultEntity.cs
    • -1
    • +2
    ./DbContext/PartialRingtoetsEntities.cs
    • -1
    • +2
    ./DbContext/RingtoetsEntities.Context.cs
    • -34
    • +95
    ./DbContext/RingtoetsEntities.edmx
    • -91
    • +93
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -3
    • +6
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +59
    ./Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs
  16. … 21 more files in changeset.
1:41 pm

Dennis Tang <dennis.tang@deltares.nl>

Regenerated context files after merge

WTI-1579

Options
    • -84
    • +84
    ./DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Ringtoets.rtd
1:32 pm

Dennis Tang <dennis.tang@deltares.nl>

Resolved by: - Discarding their changes on binary files - Merging .sql files

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

Options
    • -8
    • +8
    ./DbContext/RingtoetsEntities.edmx
  2. … 5 more files in changeset.
1:21 pm

Carlos Lubbers

Start renaming MacrostabilityOutwards -> MacroStabilityOutwards Start implementing probability assessment input and properties for macro stability outwards failure mechanism WTI-1531

Options
    • -3
    • +3
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./Create/AssessmentSectionCreateExtensions.cs
    • -0
    • +62
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs
    • -0
    • +51
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
    • -62
    • +0
    ./Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs
    • -51
    • +0
    ./Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
    • -1
    • +1
    ./DbContext/FailureMechanismType.cs
    • -4
    • +4
    ./Read/AssessmentSectionEntityReadExtensions.cs
    • -7
    • +7
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +56
    ./Read/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs
    • -56
    • +0
    ./Read/MacrostabilityOutwardsSectionResultEntityReadExtensions.cs
  12. … 54 more files in changeset.
11:37 am

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed test in storage. WTI-1589

Options
    • -1
    • +1
    ./Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs
  2. … 2 more files in changeset.
10:25 am

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed test in storage. WTI-1589

Options
    • -1
    • +1
    ./Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs
  2. … 1 more file in changeset.
8:02 am

Dennis Tang <dennis.tang@deltares.nl>

Regenerated context files related to the Ringtoets project files: - Regenerated with digit suffixes instead of written out digits

WTI-1579

Options
    • -8
    • +8
    ./DbContext/HydraulicLocationEntity.cs
    • -40
    • +40
    ./DbContext/RingtoetsEntities.edmx
    • -82
    • +82
    ./DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Ringtoets.rtd
  5. … 4 more files in changeset.
Thursday 25 Jan 2018
4:54 pm

Carlos Lubbers

Adapt N parameter in stability point structures failure mechanism to be a double on the data model and storage WTI-1531

Options
    • -2
    • +2
    ./DbContext/RingtoetsEntities.edmx
    • -86
    • +86
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -1
    • +1
    ./DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs
    • -1
    • +2
    ./Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs
    • binary
    ./Ringtoets.rtd
  6. … 12 more files in changeset.
1:26 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Added reliability to output of grass cover erosion inwards calculation. WTI-1589

Options
    • -0
    • +1
    ./Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs
  2. … 10 more files in changeset.
12:59 pm

Carlos Lubbers

Add N parameter to the grass cover erosion inwards, outwards and height structures failuremechanism database entities WTI-1531

Options
    • -1
    • +1
    ./Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs
    • -1
    • +1
    ./DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs
    • -1
    • +1
    ./DbContext/HeightStructuresFailureMechanismMetaEntity.cs
    • -6
    • +6
    ./DbContext/RingtoetsEntities.edmx
    • -79
    • +79
    ./DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Ringtoets.rtd
  10. … 15 more files in changeset.
9:15 am

Dennis Tang <dennis.tang@deltares.nl>

Regenerated context files related to the Ringtoets project files

WTI-1579

Options
    • -1
    • +1
    ./DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
    • -1
    • +1
    ./DbContext/HydraulicLocationOutputEntity.cs
    • -0
    • +3
    ./DbContext/RingtoetsEntities.edmx
    • -89
    • +89
    ./DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Ringtoets.rtd
8:06 am

Dennis Tang <dennis.tang@deltares.nl>

Resolved by: - temporarily discarding their changes when concerning a binary file - .sql files were merged accordingly

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

Options
    • -2
    • +1
    ./Application.Ringtoets.Storage.csproj
  2. … 5 more files in changeset.