Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs =================================================================== diff -u -r67530402a6e20a3f8c443c995d73e2d8b3b25744 -r3daf515badf32c085a355ce388bc0d3d9900a100 --- Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 67530402a6e20a3f8c443c995d73e2d8b3b25744) +++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 3daf515badf32c085a355ce388bc0d3d9900a100) @@ -45,6 +45,8 @@ using Core.Plugins.ProjectExplorer; using log4net; using log4net.Appender; +using log4net.Config; +using log4net.Repository; using Riskeer.ClosingStructures.Plugin; using Riskeer.DuneErosion.Plugin; using Riskeer.GrassCoverErosionInwards.Plugin; @@ -89,6 +91,9 @@ static App() { + ILoggerRepository logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly()); + XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config")); + SettingsHelper.Instance = new RiskeerSettingsHelper(); SetLanguage(); Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj =================================================================== diff -u -r71cd7f49ce3b31f4989a61a853380c1dfec16344 -r3daf515badf32c085a355ce388bc0d3d9900a100 --- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj (.../Application.Riskeer.csproj) (revision 71cd7f49ce3b31f4989a61a853380c1dfec16344) +++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj (.../Application.Riskeer.csproj) (revision 3daf515badf32c085a355ce388bc0d3d9900a100) @@ -1,241 +1,128 @@ - - + + - $(MSBuildThisFileDirectory) - Debug - x86 - Library - $(SolutionDir)\bin\$(Configuration)\ - $(OutputPath) - x86 - 4 - true - Properties - v4.5 - 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 - - Riskeer.ico - - ..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll - - - ..\..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - - - False - ..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll - - - ..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - False - - - False - + + - - ..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net45\System.Data.SQLite.dll - - - ..\..\..\..\packages\System.Data.SQLite.EF6.1.0.109.0\lib\net45\System.Data.SQLite.EF6.dll - - + + 4.0 + - - App.xaml - - + + MSBuild:Compile + Designer + - {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.Riskeer False - {7DA0AB85-828D-4B1D-B532-58B89E39BEF5} - Riskeer.ClosingStructures.Plugin False - {83885FB9-A87B-4D43-AF27-43EA44A84E42} - Riskeer.DuneErosion.Plugin False - {AD0CDC89-0A00-4068-AEEC-9838863C2FE8} - Riskeer.Integration.Forms False - {b6b27968-6b39-48df-b2e5-cbabf362808c} - Riskeer.MacroStabilityInwards.Plugin False - {ac4f7f48-f674-4e32-ab35-9c726605f684} - Riskeer.Migration False - {E3DF5559-97D9-4038-BBE6-2E3DFB4F4C68} - Riskeer.StabilityPointStructures.Plugin False - {50963f12-448c-41ba-a62c-cdb0ab8d21e0} - Riskeer.Storage.Core False - {83A782F1-BA78-4D5C-B213-39066605AFD8} - Riskeer.WaveImpactAsphaltCover.Plugin False - {20955E2A-8CEB-46B0-ADC4-A97D4C6BBDF5} - Riskeer.GrassCoverErosionInwards.Plugin False - {9B3ED064-E29F-4D38-85E0-3A82B77BA702} - Riskeer.GrassCoverErosionOutwards.Plugin False - {9AF85B2B-8D78-43C5-9542-FBB3A14EAB36} - Riskeer.HeightStructures.Plugin False - {11F1F874-45AF-43E4-8AE5-15A5C9593E28} - Riskeer.Integration.Data False - {c8383b76-b3f1-4e6e-b56c-527b469fa20a} - Riskeer.Integration.Plugin False - {1D3D58B6-EF7E-401E-92A0-104067D222EE} - Riskeer.Piping.Plugin False - {9ddc42cc-a2cc-4900-a711-aa1dd6d3a94a} - Riskeer.StabilityStoneCover.Plugin False Copying.licenseheader - - Designer - - - - MSBuild:Compile - Designer - + - + + 3.4.0 + + + 2.0.8 + + + 1.0.109.2 + + + 1.0.109 + - - - Properties\GlobalAssembly.cs - + + PreserveNewest + - - - - 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 Fisheye: Tag 3daf515badf32c085a355ce388bc0d3d9900a100 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3daf515badf32c085a355ce388bc0d3d9900a100 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer/Resources.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Riskeer/src/Application.Riskeer/app.config =================================================================== diff -u -rd9badaf07b2edd9e7d0d2a2fd9bc684b95b830f8 -r3daf515badf32c085a355ce388bc0d3d9900a100 --- Application/Riskeer/src/Application.Riskeer/app.config (.../app.config) (revision d9badaf07b2edd9e7d0d2a2fd9bc684b95b830f8) +++ Application/Riskeer/src/Application.Riskeer/app.config (.../app.config) (revision 3daf515badf32c085a355ce388bc0d3d9900a100) @@ -26,7 +26,6 @@ --> -
@@ -41,28 +40,6 @@ - - - - - - - - - - - - - - - - - - - - - - Index: Application/Riskeer/src/Application.Riskeer/log4net.config =================================================================== diff -u --- Application/Riskeer/src/Application.Riskeer/log4net.config (revision 0) +++ Application/Riskeer/src/Application.Riskeer/log4net.config (revision 3daf515badf32c085a355ce388bc0d3d9900a100) @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Riskeer.sln =================================================================== diff -u -r54eaeeec98bf8513617808fde953a216c569874a -r3daf515badf32c085a355ce388bc0d3d9900a100 --- Riskeer.sln (.../Riskeer.sln) (revision 54eaeeec98bf8513617808fde953a216c569874a) +++ Riskeer.sln (.../Riskeer.sln) (revision 3daf515badf32c085a355ce388bc0d3d9900a100) @@ -105,7 +105,6 @@ {2BDF07D4-0E81-4B9E-9618-E7EBD9399912} = {2BDF07D4-0E81-4B9E-9618-E7EBD9399912} {8513B8D6-79C8-4173-B663-59C91AC65E5F} = {8513B8D6-79C8-4173-B663-59C91AC65E5F} {1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99} = {1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99} - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} {D951D6DA-FE83-4920-9FDB-63BF96480B54} = {D951D6DA-FE83-4920-9FDB-63BF96480B54} {7CD038E1-E111-4969-ACED-22C5BD2974E1} = {7CD038E1-E111-4969-ACED-22C5BD2974E1} {EDDC30E9-D793-478A-AD37-9F257CE23A22} = {EDDC30E9-D793-478A-AD37-9F257CE23A22} Index: build/Source.targets =================================================================== diff -u -r3b6aa7390550a23337a89d5caf75eb598f6c518b -r3daf515badf32c085a355ce388bc0d3d9900a100 --- build/Source.targets (.../Source.targets) (revision 3b6aa7390550a23337a89d5caf75eb598f6c518b) +++ build/Source.targets (.../Source.targets) (revision 3daf515badf32c085a355ce388bc0d3d9900a100) @@ -47,7 +47,7 @@ Release TRACE true - pdbonly + pdbonly