Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj =================================================================== diff -u -r8f73b0c9457595a596365e743bdebe7861b2771e -reb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 --- Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision 8f73b0c9457595a596365e743bdebe7861b2771e) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -234,8 +234,8 @@ - - Application.Ringtoets + + Application.Riskeer {4a7d6720-4aa1-4f0b-a796-a0436db3d7d7} True True Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -reb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 --- Application/Ringtoets/src/Application.Ringtoets/App.xaml (.../App.xaml) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Application/Ringtoets/src/Application.Ringtoets/App.xaml (.../App.xaml) (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -20,7 +20,7 @@ Stichting Deltares and remain full property of Stichting Deltares at all times. All rights reserved. --> - Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -rad2c5e613cf070ab1697c2159af5cb2df7442913 -reb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 --- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision ad2c5e613cf070ab1697c2159af5cb2df7442913) +++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -43,6 +43,7 @@ using Core.Plugins.CommonTools; using Core.Plugins.Map; using Core.Plugins.ProjectExplorer; +using Demo.Ringtoets.GUIs; using log4net; using log4net.Appender; using Ringtoets.ClosingStructures.Plugin; @@ -63,11 +64,10 @@ using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; using MessageBox = System.Windows.MessageBox; #if DEVELOPMENT -using Demo.Ringtoets.GUIs; #endif -namespace Application.Ringtoets +namespace Application.Riskeer { /// /// Interaction logic for App.xaml. Fisheye: Tag eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets/Application.Riskeer.csproj =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets/Application.Riskeer.csproj (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets/Application.Riskeer.csproj (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -0,0 +1,244 @@ + + + + $(MSBuildThisFileDirectory) + Debug + x86 + Library + $(SolutionDir)\bin\$(Configuration)\ + $(OutputPath) + x86 + 4 + true + Properties + v4.0 + 512 + {4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7} + WinExe + Application.Riskeer + Riskeer + Always + + + true + false + DEBUG;TRACE;DEVELOPMENT + + + none + true + TRACE;DEVELOPMENT + + + TRACE + none + + + TRACE;DEVELOPMENT + none + + + true + none + false + + + Ringtoets.ico + + + + ..\..\..\..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.dll + True + + + ..\..\..\..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.SqlServer.dll + + + False + ..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll + + + ..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll + + + False + + + False + + + + + + ..\..\..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net40\System.Data.SQLite.dll + True + + + ..\..\..\..\packages\System.Data.SQLite.EF6.1.0.106.0\lib\net40\System.Data.SQLite.EF6.dll + True + + + + + + + + + App.xaml + + + + + + {3bbfd65b-b277-4e50-ae6d-bd24c3434609} + Core.Common.Base + False + + + {9A2D67E6-26AC-4D17-B11A-2B4372F2F572} + Core.Common.Controls + False + + + {30e4c2ae-719e-4d70-9fa9-668a9767fbfa} + Core.Common.Gui + False + + + {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} + Core.Common.Util + False + + + {4163B996-3455-4324-A38A-9F2F0E6FCB52} + Core.Plugins.Chart + False + + + {93E73FAB-FAE8-49C6-9ABB-27D24DF761F6} + Core.Plugins.CommonTools + False + + + {610E0A9C-1997-4C43-A10E-39D4C66ADA93} + Core.Plugins.Map + False + + + {ED20DBA9-D577-423F-A68D-A0A8130FB10B} + Core.Plugins.ProjectExplorer + False + + + {ffe3a667-3a4c-4f48-bc6b-1589867fcb41} + Demo.Ringtoets + False + + + {7DA0AB85-828D-4B1D-B532-58B89E39BEF5} + Ringtoets.ClosingStructures.Plugin + False + + + {83885FB9-A87B-4D43-AF27-43EA44A84E42} + Ringtoets.DuneErosion.Plugin + False + + + {AD0CDC89-0A00-4068-AEEC-9838863C2FE8} + Ringtoets.Integration.Forms + False + + + {b6b27968-6b39-48df-b2e5-cbabf362808c} + Ringtoets.MacroStabilityInwards.Plugin + False + + + {ac4f7f48-f674-4e32-ab35-9c726605f684} + Ringtoets.Migration + False + + + {E3DF5559-97D9-4038-BBE6-2E3DFB4F4C68} + Ringtoets.StabilityPointStructures.Plugin + False + + + {50963f12-448c-41ba-a62c-cdb0ab8d21e0} + Ringtoets.Storage.Core + False + + + {83A782F1-BA78-4D5C-B213-39066605AFD8} + Ringtoets.WaveImpactAsphaltCover.Plugin + False + + + {20955E2A-8CEB-46B0-ADC4-A97D4C6BBDF5} + Ringtoets.GrassCoverErosionInwards.Plugin + False + + + {9B3ED064-E29F-4D38-85E0-3A82B77BA702} + Ringtoets.GrassCoverErosionOutwards.Plugin + False + + + {9AF85B2B-8D78-43C5-9542-FBB3A14EAB36} + Ringtoets.HeightStructures.Plugin + False + + + {11F1F874-45AF-43E4-8AE5-15A5C9593E28} + Ringtoets.Integration.Data + False + + + {c8383b76-b3f1-4e6e-b56c-527b469fa20a} + Ringtoets.Integration.Plugin + False + + + {1D3D58B6-EF7E-401E-92A0-104067D222EE} + Ringtoets.Piping.Plugin + False + + + {9ddc42cc-a2cc-4900-a711-aa1dd6d3a94a} + Ringtoets.StabilityStoneCover.Plugin + False + + + + + Copying.licenseheader + + + Designer + + + + + + MSBuild:Compile + Designer + + + + + + + + + Properties\GlobalAssembly.cs + + + + + + This project references NuGet package(s) that are missing on this computer. Use 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: Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -reb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 --- Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs (.../AppTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs (.../AppTest.cs) (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -22,6 +22,7 @@ using System; using System.DirectoryServices.AccountManagement; using System.Linq; +using Application.Riskeer; using Core.Common.TestUtil; using Core.Common.Util.Settings; using NUnit.Framework; Index: Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj =================================================================== diff -u -r82053f60d9f69b1fa97c3239ef8d75944d3ea60a -reb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 --- Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj (.../Application.Ringtoets.Test.csproj) (revision 82053f60d9f69b1fa97c3239ef8d75944d3ea60a) +++ Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj (.../Application.Ringtoets.Test.csproj) (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -42,9 +42,9 @@ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8} Ringtoets.Integration.Forms - + {4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7} - Application.Ringtoets + Application.Riskeer \ No newline at end of file Index: Ringtoets.sln =================================================================== diff -u -r8e6e288ada905cdf2db9b5a57f1b4f2ba718023d -reb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397 --- Ringtoets.sln (.../Ringtoets.sln) (revision 8e6e288ada905cdf2db9b5a57f1b4f2ba718023d) +++ Ringtoets.sln (.../Ringtoets.sln) (revision eb9ae3e1e1ff0b2f8135d77464dfc4b3ddd3e397) @@ -12,7 +12,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{FE36E7E0-D5F7-48E3-9730-D05443351EAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Ringtoets", "Application\Ringtoets\src\Application.Ringtoets\Application.Ringtoets.csproj", "{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Riskeer", "Application\Ringtoets\src\Application.Ringtoets\Application.Riskeer.csproj", "{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}" ProjectSection(ProjectDependencies) = postProject {EC2DEF03-71FE-48A0-AB85-31E13112E4A1} = {EC2DEF03-71FE-48A0-AB85-31E13112E4A1} {C6309704-D67B-434C-BC98-9F8910BC1D10} = {C6309704-D67B-434C-BC98-9F8910BC1D10}