diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 3e273a78..fdca3b66 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -26,12 +26,12 @@ 1000 - - http://heupferd/bsmd.LockingService/LockingService.svc + http://192.168.2.24/LockingService/LockingService.svc + - - Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False + Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index e1704e53..a6927fdf 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -34,8 +34,8 @@ 5.4.0.0 true publish.html - 1 - 6.4.1.%2a + 0 + 6.4.2.%2a false true true @@ -107,8 +107,8 @@ - - packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net451\System.Data.SQLite.dll + + packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\lib\net451\System.Data.SQLite.dll @@ -130,20 +130,20 @@ - - packages\Extended.Wpf.Toolkit.4.0.1\lib\net40\Xceed.Wpf.AvalonDock.dll + + packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.dll - - packages\Extended.Wpf.Toolkit.4.0.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - - packages\Extended.Wpf.Toolkit.4.0.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - - packages\Extended.Wpf.Toolkit.4.0.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - - packages\Extended.Wpf.Toolkit.4.0.1\lib\net40\Xceed.Wpf.Toolkit.dll + + packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.Toolkit.dll @@ -839,12 +839,12 @@ - + 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 diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 902fd55f..ac99826f 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj b/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj index 3d606baf..7eaf075e 100644 --- a/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj +++ b/nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj @@ -45,9 +45,8 @@ 4 - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - True + + ..\..\..\ENI-2\ENI2\ENI2\packages\log4net.2.0.12\lib\net45\log4net.dll @@ -104,11 +103,11 @@ - bsmdKey.snk + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/nsw/Source/bsmd.LockingService/packages.config b/nsw/Source/bsmd.LockingService/packages.config index 2b3696ab..255f9a6f 100644 --- a/nsw/Source/bsmd.LockingService/packages.config +++ b/nsw/Source/bsmd.LockingService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/nsw/Source/bsmd.POService/bsmd.POService.csproj b/nsw/Source/bsmd.POService/bsmd.POService.csproj index ecfde013..974a7c32 100644 --- a/nsw/Source/bsmd.POService/bsmd.POService.csproj +++ b/nsw/Source/bsmd.POService/bsmd.POService.csproj @@ -34,13 +34,15 @@ 4 - - packages\log4net.2.0.8\lib\net45-full\log4net.dll + + packages\log4net.2.0.12\lib\net45\log4net.dll + + diff --git a/nsw/Source/bsmd.POService/packages.config b/nsw/Source/bsmd.POService/packages.config index 6059782b..43bfb759 100644 --- a/nsw/Source/bsmd.POService/packages.config +++ b/nsw/Source/bsmd.POService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj b/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj index 0e8ec2e0..853dd096 100644 --- a/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj +++ b/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj @@ -43,8 +43,8 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll + + ..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\packages\PDFsharp-MigraDoc-gdi.1.50.5147\lib\net20\MigraDoc.DocumentObjectModel-gdi.dll @@ -65,8 +65,8 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net45\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\lib\net45\System.Data.SQLite.dll @@ -161,12 +161,12 @@ - + 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}. - +