From f332d73d86a46d0a62bedda61ae7bcb7a049df3b Mon Sep 17 00:00:00 2001 From: David Siebert Date: Fri, 11 Sep 2020 15:18:50 +0200 Subject: [PATCH 01/11] =?UTF-8?q?Unn=C3=B6tige=20Referenzen=20entfernen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataInputt/DataInputt.Tests/DataInputt.Tests.csproj | 4 ---- DataInputt/DataInputt/DataInputt.csproj | 7 ------- DataInputt/WcfServer/DataInputService.cs | 1 - DataInputt/WcfServer/IDataInputService.cs | 1 - DataInputt/WcfServer/WcfServer.csproj | 4 ---- 5 files changed, 17 deletions(-) diff --git a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj index 602c53a..19de419 100644 --- a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj +++ b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj @@ -44,12 +44,8 @@ ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - - diff --git a/DataInputt/DataInputt/DataInputt.csproj b/DataInputt/DataInputt/DataInputt.csproj index 879d078..5e9259f 100644 --- a/DataInputt/DataInputt/DataInputt.csproj +++ b/DataInputt/DataInputt/DataInputt.csproj @@ -66,8 +66,6 @@ ..\packages\NLog.4.5.1\lib\net45\NLog.dll - - ..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net451\System.Data.SQLite.dll @@ -81,13 +79,8 @@ - - - - - 4.0 diff --git a/DataInputt/WcfServer/DataInputService.cs b/DataInputt/WcfServer/DataInputService.cs index 0d59a92..3792075 100644 --- a/DataInputt/WcfServer/DataInputService.cs +++ b/DataInputt/WcfServer/DataInputService.cs @@ -2,7 +2,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Configuration; -using System.Linq; using System.Runtime.Serialization; using System.ServiceModel; using System.Text; diff --git a/DataInputt/WcfServer/IDataInputService.cs b/DataInputt/WcfServer/IDataInputService.cs index c39d9e0..569bd20 100644 --- a/DataInputt/WcfServer/IDataInputService.cs +++ b/DataInputt/WcfServer/IDataInputService.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; using System.ServiceModel; using System.Text; diff --git a/DataInputt/WcfServer/WcfServer.csproj b/DataInputt/WcfServer/WcfServer.csproj index c8d4601..5ec7856 100644 --- a/DataInputt/WcfServer/WcfServer.csproj +++ b/DataInputt/WcfServer/WcfServer.csproj @@ -34,14 +34,10 @@ 4 - - - - From 93b60edacfd0ca960121e6bb4dcdd0e24972e00c Mon Sep 17 00:00:00 2001 From: David Siebert Date: Fri, 11 Sep 2020 15:23:29 +0200 Subject: [PATCH 02/11] Packages.config in PackageReference wandeln --- .../DataInputt.Tests/DataInputt.Tests.csproj | 26 +- DataInputt/DataInputt/App.config | 13 +- DataInputt/DataInputt/DataInputt.csproj | 52 ++-- .../DataInputt.Tests/DataInputt.Tests.csproj | 73 +++++ .../DataInputt.Tests/NuGetUpgradeLog.html | 163 +++++++++++ .../DataInputt.Tests/packages.config | 0 .../6a958a37/DataInputt/DataInputt.csproj | 265 ++++++++++++++++++ .../6a958a37/DataInputt/NuGetUpgradeLog.html | 166 +++++++++++ .../6a958a37}/DataInputt/packages.config | 0 9 files changed, 695 insertions(+), 63 deletions(-) create mode 100644 DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/DataInputt.Tests.csproj create mode 100644 DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/NuGetUpgradeLog.html rename DataInputt/{ => MigrationBackup/15b385d2}/DataInputt.Tests/packages.config (100%) create mode 100644 DataInputt/MigrationBackup/6a958a37/DataInputt/DataInputt.csproj create mode 100644 DataInputt/MigrationBackup/6a958a37/DataInputt/NuGetUpgradeLog.html rename DataInputt/{ => MigrationBackup/6a958a37}/DataInputt/packages.config (100%) diff --git a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj index 19de419..a66020c 100644 --- a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj +++ b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj @@ -1,6 +1,5 @@  - Debug AnyCPU @@ -38,12 +37,6 @@ 4 - - ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - @@ -51,23 +44,20 @@ - - - {5E84912A-4948-49FE-BFFF-465A7FDC2C1C} DataInputt + + + 1.2.0 + + + 1.2.0 + + - - - 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/DataInputt/DataInputt/App.config b/DataInputt/DataInputt/App.config index 60a1b06..017baad 100644 --- a/DataInputt/DataInputt/App.config +++ b/DataInputt/DataInputt/App.config @@ -4,7 +4,7 @@
- +
@@ -32,12 +32,7 @@ - - - - - - + @@ -49,9 +44,7 @@ - + diff --git a/DataInputt/DataInputt/DataInputt.csproj b/DataInputt/DataInputt/DataInputt.csproj index 5e9259f..e307e32 100644 --- a/DataInputt/DataInputt/DataInputt.csproj +++ b/DataInputt/DataInputt/DataInputt.csproj @@ -1,6 +1,5 @@  - Debug @@ -53,29 +52,8 @@ - - ..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.1\lib\net45\NLog.dll - - - ..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net451\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.112.0\lib\net451\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.112.0\lib\net451\System.Data.SQLite.Linq.dll - @@ -210,9 +188,6 @@ Designer - - Designer - SettingsSingleFileGenerator Settings.Designer.cs @@ -251,15 +226,22 @@ Reference.cs + + + 6.3.0 + + + 10.0.3 + + + 4.5.1 + + + 1.0.112 + + + 1.0.112 + + - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - - - - \ No newline at end of file diff --git a/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/DataInputt.Tests.csproj new file mode 100644 index 0000000..19de419 --- /dev/null +++ b/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/DataInputt.Tests.csproj @@ -0,0 +1,73 @@ + + + + + Debug + AnyCPU + {89EB8C2B-A0CE-4301-ADB9-F57F38E4F1F3} + Library + Properties + DataInputt.Tests + DataInputt.Tests + v4.6.1 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + + + + + + + + + + + + {5E84912A-4948-49FE-BFFF-465A7FDC2C1C} + DataInputt + + + + + + + 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/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/NuGetUpgradeLog.html b/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/NuGetUpgradeLog.html new file mode 100644 index 0000000..253c667 --- /dev/null +++ b/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/NuGetUpgradeLog.html @@ -0,0 +1,163 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - DataInputt.Tests

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + C:\Code\Einarbeitung\DataInputFrontend-David\DataInputt\MigrationBackup\15b385d2\DataInputt.Tests
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
MSTest.TestAdapter + v1.2.0
MSTest.TestFramework + v1.2.0

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/DataInputt/DataInputt.Tests/packages.config b/DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/packages.config similarity index 100% rename from DataInputt/DataInputt.Tests/packages.config rename to DataInputt/MigrationBackup/15b385d2/DataInputt.Tests/packages.config diff --git a/DataInputt/MigrationBackup/6a958a37/DataInputt/DataInputt.csproj b/DataInputt/MigrationBackup/6a958a37/DataInputt/DataInputt.csproj new file mode 100644 index 0000000..5e9259f --- /dev/null +++ b/DataInputt/MigrationBackup/6a958a37/DataInputt/DataInputt.csproj @@ -0,0 +1,265 @@ + + + + + + Debug + AnyCPU + {5E84912A-4948-49FE-BFFF-465A7FDC2C1C} + WinExe + DataInputt + DataInputt + v4.5.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + ..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.1\lib\net45\NLog.dll + + + + + ..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net451\System.Data.SQLite.dll + + + ..\packages\System.Data.SQLite.EF6.1.0.112.0\lib\net451\System.Data.SQLite.EF6.dll + + + ..\packages\System.Data.SQLite.Linq.1.0.112.0\lib\net451\System.Data.SQLite.Linq.dll + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + True + True + Reference.svcmap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Page1.xaml + + + + + + Zeiterfassung.xaml + + + Projects.xaml + + + + + + PublisherPage.xaml + + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + Designer + + + Reference.svcmap + + + + Designer + + + Designer + + + Designer + + + Designer + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + False + Microsoft .NET Framework 4.5.2 %28x86 und x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + + + + + + + + + + WCF Proxy Generator + Reference.cs + + + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + + + + + + + \ No newline at end of file diff --git a/DataInputt/MigrationBackup/6a958a37/DataInputt/NuGetUpgradeLog.html b/DataInputt/MigrationBackup/6a958a37/DataInputt/NuGetUpgradeLog.html new file mode 100644 index 0000000..ac76054 --- /dev/null +++ b/DataInputt/MigrationBackup/6a958a37/DataInputt/NuGetUpgradeLog.html @@ -0,0 +1,166 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - DataInputt

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + C:\Code\Einarbeitung\DataInputFrontend-David\DataInputt\MigrationBackup\6a958a37\DataInputt
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
EntityFramework + v6.3.0
Newtonsoft.Json + v10.0.3
NLog + v4.5.1
System.Data.SQLite + v1.0.112
System.Data.SQLite.Core + v1.0.112

Transitive dependencies:

Package IdVersion
System.Data.SQLite.EF6 + v1.0.112
System.Data.SQLite.Linq + v1.0.112

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/DataInputt/DataInputt/packages.config b/DataInputt/MigrationBackup/6a958a37/DataInputt/packages.config similarity index 100% rename from DataInputt/DataInputt/packages.config rename to DataInputt/MigrationBackup/6a958a37/DataInputt/packages.config From fc301d86d614c950343ddb27f08bc32e408378aa Mon Sep 17 00:00:00 2001 From: David Siebert Date: Fri, 11 Sep 2020 15:25:31 +0200 Subject: [PATCH 03/11] Aktualisieren auf neue .NET Version --- .../DataInputt.Tests/DataInputt.Tests.csproj | 3 +- DataInputt/DataInputt/App.config | 24 +++++----- DataInputt/DataInputt/DataInputt.csproj | 3 +- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../Properties/Settings.Designer.cs | 2 +- 5 files changed, 35 insertions(+), 41 deletions(-) diff --git a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj index a66020c..8a0caa4 100644 --- a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj +++ b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj @@ -8,7 +8,7 @@ Properties DataInputt.Tests DataInputt.Tests - v4.6.1 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 @@ -18,6 +18,7 @@ UnitTest + true diff --git a/DataInputt/DataInputt/App.config b/DataInputt/DataInputt/App.config index 017baad..996d6bd 100644 --- a/DataInputt/DataInputt/App.config +++ b/DataInputt/DataInputt/App.config @@ -1,25 +1,25 @@ - + -
+
-
+
- + - + - + - + NLogFacade @@ -28,8 +28,8 @@ - - + + @@ -38,7 +38,7 @@ - + @@ -46,9 +46,9 @@ - + - \ No newline at end of file + diff --git a/DataInputt/DataInputt/DataInputt.csproj b/DataInputt/DataInputt/DataInputt.csproj index e307e32..31976ae 100644 --- a/DataInputt/DataInputt/DataInputt.csproj +++ b/DataInputt/DataInputt/DataInputt.csproj @@ -8,7 +8,7 @@ WinExe DataInputt DataInputt - v4.5.2 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -30,6 +30,7 @@ 1.0.0.%2a false true + AnyCPU diff --git a/DataInputt/DataInputt/Properties/Resources.Designer.cs b/DataInputt/DataInputt/Properties/Resources.Designer.cs index f1929af..a67eeee 100644 --- a/DataInputt/DataInputt/Properties/Resources.Designer.cs +++ b/DataInputt/DataInputt/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace DataInputt.Properties -{ - - +namespace DataInputt.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace DataInputt.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DataInputt.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/DataInputt/DataInputt/Properties/Settings.Designer.cs b/DataInputt/DataInputt/Properties/Settings.Designer.cs index 9ac34e6..819d840 100644 --- a/DataInputt/DataInputt/Properties/Settings.Designer.cs +++ b/DataInputt/DataInputt/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace DataInputt.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); From 084d07d908548de57386e1b1c9a0605c57f68327 Mon Sep 17 00:00:00 2001 From: David Siebert Date: Mon, 14 Sep 2020 08:42:46 +0200 Subject: [PATCH 04/11] Umstellung *.csproj auf .NET 5.0 / nicht kompilierbar --- .../DataInputt.Tests/DataInputt.Tests.csproj | 6 - DataInputt/DataInputt/DataInputt.csproj | 234 +----------------- 2 files changed, 8 insertions(+), 232 deletions(-) diff --git a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj index 8a0caa4..0b30921 100644 --- a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj +++ b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj @@ -45,12 +45,6 @@ - - - {5E84912A-4948-49FE-BFFF-465A7FDC2C1C} - DataInputt - - 1.2.0 diff --git a/DataInputt/DataInputt/DataInputt.csproj b/DataInputt/DataInputt/DataInputt.csproj index 31976ae..91af151 100644 --- a/DataInputt/DataInputt/DataInputt.csproj +++ b/DataInputt/DataInputt/DataInputt.csproj @@ -1,232 +1,14 @@ - - - + + - Debug - AnyCPU - {5E84912A-4948-49FE-BFFF-465A7FDC2C1C} WinExe + net5.0-windows + true DataInputt DataInputt - v4.7.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - + DataInputt.App + false - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - True - True - Reference.svcmap - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Page1.xaml - - - - - - Zeiterfassung.xaml - - - Projects.xaml - - - - - - PublisherPage.xaml - - - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - Designer - - - Reference.svcmap - - - - Designer - - - Designer - - - Designer - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - False - Microsoft .NET Framework 4.5.2 %28x86 und x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - - - - - WCF Proxy Generator - Reference.cs - - 6.3.0 @@ -244,5 +26,5 @@ 1.0.112 - - \ No newline at end of file + + From 1654bc3444f59973aa63fb0444e979c63c5b3028 Mon Sep 17 00:00:00 2001 From: David Siebert Date: Mon, 14 Sep 2020 09:14:01 +0200 Subject: [PATCH 05/11] =?UTF-8?q?Entfernen=20der=20Verweise=20auf=20WCF=20?= =?UTF-8?q?Service=20und=20kompilierf=C3=A4higkeit=20wiederhergestellt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataInputt/DataInputt/App.config | 21 +- .../DataInputServiceReference/Arrays.xsd | 27 - ....DataInputServiceReference.Time.datasource | 10 - .../DataInputServiceReference/Reference.cs | 310 ---------- .../Reference.svcmap | 35 -- .../DataInputServiceReference/WcfServer.xsd | 26 - .../configuration.svcinfo | 10 - .../configuration91.svcinfo | 186 ------ .../DataInputServiceReference/service.wsdl | 569 ------------------ .../DataInputServiceReference/service.xsd | 93 --- .../DataInputServiceReference/service1.xsd | 42 -- DataInputt/DataInputt/TimeRepo.cs | 4 +- .../ZeitService/IDataInputService.cs | 38 ++ DataInputt/DataInputt/Zeiterfassung.xaml.cs | 13 +- 14 files changed, 47 insertions(+), 1337 deletions(-) delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/Arrays.xsd delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/DataInputt.DataInputServiceReference.Time.datasource delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.cs delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.svcmap delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/WcfServer.xsd delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration.svcinfo delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration91.svcinfo delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.wsdl delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.xsd delete mode 100644 DataInputt/DataInputt/Connected Services/DataInputServiceReference/service1.xsd create mode 100644 DataInputt/DataInputt/ZeitService/IDataInputService.cs diff --git a/DataInputt/DataInputt/App.config b/DataInputt/DataInputt/App.config index 996d6bd..368fc3e 100644 --- a/DataInputt/DataInputt/App.config +++ b/DataInputt/DataInputt/App.config @@ -31,24 +31,5 @@ - - - - - - - - - - - - - - - - - - - - + diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Arrays.xsd b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Arrays.xsd deleted file mode 100644 index d7d7217..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Arrays.xsd +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/DataInputt.DataInputServiceReference.Time.datasource b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/DataInputt.DataInputServiceReference.Time.datasource deleted file mode 100644 index 6607625..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/DataInputt.DataInputServiceReference.Time.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DataInputt.DataInputServiceReference.Time, Connected Services.DataInputServiceReference.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.cs b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.cs deleted file mode 100644 index 29c75c5..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.cs +++ /dev/null @@ -1,310 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace DataInputt.DataInputServiceReference { - using System.Runtime.Serialization; - using System; - - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="User", Namespace="http://schemas.datacontract.org/2004/07/WcfServer")] - [System.SerializableAttribute()] - public partial class User : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PasswortField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Passwort { - get { - return this.PasswortField; - } - set { - if ((object.ReferenceEquals(this.PasswortField, value) != true)) { - this.PasswortField = value; - this.RaisePropertyChanged("Passwort"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="Time", Namespace="http://schemas.datacontract.org/2004/07/WcfServer")] - [System.SerializableAttribute()] - public partial class Time : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.DateTime EndField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int IdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ProjectField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.DateTime StartField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int uIdField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.DateTime End { - get { - return this.EndField; - } - set { - if ((this.EndField.Equals(value) != true)) { - this.EndField = value; - this.RaisePropertyChanged("End"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int Id { - get { - return this.IdField; - } - set { - if ((this.IdField.Equals(value) != true)) { - this.IdField = value; - this.RaisePropertyChanged("Id"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Project { - get { - return this.ProjectField; - } - set { - if ((object.ReferenceEquals(this.ProjectField, value) != true)) { - this.ProjectField = value; - this.RaisePropertyChanged("Project"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.DateTime Start { - get { - return this.StartField; - } - set { - if ((this.StartField.Equals(value) != true)) { - this.StartField = value; - this.RaisePropertyChanged("Start"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int uId { - get { - return this.uIdField; - } - set { - if ((this.uIdField.Equals(value) != true)) { - this.uIdField = value; - this.RaisePropertyChanged("uId"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="DataInputServiceReference.IDataInputService", CallbackContract=typeof(DataInputt.DataInputServiceReference.IDataInputServiceCallback))] - public interface IDataInputService { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/CreateUser", ReplyAction="http://tempuri.org/IDataInputService/CreateUserResponse")] - int CreateUser(DataInputt.DataInputServiceReference.User user); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/CreateUser", ReplyAction="http://tempuri.org/IDataInputService/CreateUserResponse")] - System.Threading.Tasks.Task CreateUserAsync(DataInputt.DataInputServiceReference.User user); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/Login", ReplyAction="http://tempuri.org/IDataInputService/LoginResponse")] - int Login(DataInputt.DataInputServiceReference.User user); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/Login", ReplyAction="http://tempuri.org/IDataInputService/LoginResponse")] - System.Threading.Tasks.Task LoginAsync(DataInputt.DataInputServiceReference.User user); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/GetTimes", ReplyAction="http://tempuri.org/IDataInputService/GetTimesResponse")] - DataInputt.DataInputServiceReference.Time[] GetTimes(int userId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/GetTimes", ReplyAction="http://tempuri.org/IDataInputService/GetTimesResponse")] - System.Threading.Tasks.Task GetTimesAsync(int userId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/AddTime", ReplyAction="http://tempuri.org/IDataInputService/AddTimeResponse")] - void AddTime(DataInputt.DataInputServiceReference.Time time, int userId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/AddTime", ReplyAction="http://tempuri.org/IDataInputService/AddTimeResponse")] - System.Threading.Tasks.Task AddTimeAsync(DataInputt.DataInputServiceReference.Time time, int userId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/Projects", ReplyAction="http://tempuri.org/IDataInputService/ProjectsResponse")] - string[] Projects(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/Projects", ReplyAction="http://tempuri.org/IDataInputService/ProjectsResponse")] - System.Threading.Tasks.Task ProjectsAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/CalculateEarnings", ReplyAction="http://tempuri.org/IDataInputService/CalculateEarningsResponse")] - decimal CalculateEarnings(int id); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDataInputService/CalculateEarnings", ReplyAction="http://tempuri.org/IDataInputService/CalculateEarningsResponse")] - System.Threading.Tasks.Task CalculateEarningsAsync(int id); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IDataInputServiceCallback { - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IDataInputService/EarningsCalculated")] - void EarningsCalculated(System.Collections.Generic.Dictionary earnings); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IDataInputServiceChannel : DataInputt.DataInputServiceReference.IDataInputService, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class DataInputServiceClient : System.ServiceModel.DuplexClientBase, DataInputt.DataInputServiceReference.IDataInputService { - - public DataInputServiceClient(System.ServiceModel.InstanceContext callbackInstance) : - base(callbackInstance) { - } - - public DataInputServiceClient(System.ServiceModel.InstanceContext callbackInstance, string endpointConfigurationName) : - base(callbackInstance, endpointConfigurationName) { - } - - public DataInputServiceClient(System.ServiceModel.InstanceContext callbackInstance, string endpointConfigurationName, string remoteAddress) : - base(callbackInstance, endpointConfigurationName, remoteAddress) { - } - - public DataInputServiceClient(System.ServiceModel.InstanceContext callbackInstance, string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(callbackInstance, endpointConfigurationName, remoteAddress) { - } - - public DataInputServiceClient(System.ServiceModel.InstanceContext callbackInstance, System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(callbackInstance, binding, remoteAddress) { - } - - public int CreateUser(DataInputt.DataInputServiceReference.User user) { - return base.Channel.CreateUser(user); - } - - public System.Threading.Tasks.Task CreateUserAsync(DataInputt.DataInputServiceReference.User user) { - return base.Channel.CreateUserAsync(user); - } - - public int Login(DataInputt.DataInputServiceReference.User user) { - return base.Channel.Login(user); - } - - public System.Threading.Tasks.Task LoginAsync(DataInputt.DataInputServiceReference.User user) { - return base.Channel.LoginAsync(user); - } - - public DataInputt.DataInputServiceReference.Time[] GetTimes(int userId) { - return base.Channel.GetTimes(userId); - } - - public System.Threading.Tasks.Task GetTimesAsync(int userId) { - return base.Channel.GetTimesAsync(userId); - } - - public void AddTime(DataInputt.DataInputServiceReference.Time time, int userId) { - base.Channel.AddTime(time, userId); - } - - public System.Threading.Tasks.Task AddTimeAsync(DataInputt.DataInputServiceReference.Time time, int userId) { - return base.Channel.AddTimeAsync(time, userId); - } - - public string[] Projects() { - return base.Channel.Projects(); - } - - public System.Threading.Tasks.Task ProjectsAsync() { - return base.Channel.ProjectsAsync(); - } - - public decimal CalculateEarnings(int id) { - return base.Channel.CalculateEarnings(id); - } - - public System.Threading.Tasks.Task CalculateEarningsAsync(int id) { - return base.Channel.CalculateEarningsAsync(id); - } - } -} diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.svcmap b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.svcmap deleted file mode 100644 index e6f3f67..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/Reference.svcmap +++ /dev/null @@ -1,35 +0,0 @@ - - - - false - true - true - - false - false - false - - - true - Auto - true - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/WcfServer.xsd b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/WcfServer.xsd deleted file mode 100644 index 11b4399..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/WcfServer.xsd +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration.svcinfo b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration.svcinfo deleted file mode 100644 index bcb0cb3..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration91.svcinfo b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration91.svcinfo deleted file mode 100644 index 06283c7..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/configuration91.svcinfo +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - WSDualHttpBinding_IDataInputService - - - - - - - - - - - - - - - - - - - - - False - - - StrongWildcard - - - - - - - - - Text - - - - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.ServiceModel.Configuration.StandardBindingReliableSessionElement - - - True - - - 00:10:00 - - - System.ServiceModel.Configuration.WSDualHttpSecurityElement - - - Message - - - System.ServiceModel.Configuration.MessageSecurityOverHttpElement - - - Windows - - - True - - - Default - - - System.Text.UTF8Encoding - - - - - - - - - - - - http://localhost:8733/Design_Time_Addresses/WcfServer/DataInputService/ - - - - - - wsDualHttpBinding - - - WSDualHttpBinding_IDataInputService - - - DataInputServiceReference.IDataInputService - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - localhost - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - WSDualHttpBinding_IDataInputService - - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.wsdl b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.wsdl deleted file mode 100644 index 02af9c8..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.wsdl +++ /dev/null @@ -1,569 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://localhost:8733/Design_Time_Addresses/WcfServer/DataInputService/ - - localhost - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.xsd b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.xsd deleted file mode 100644 index df0c16e..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service.xsd +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service1.xsd b/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service1.xsd deleted file mode 100644 index b4d5ff0..0000000 --- a/DataInputt/DataInputt/Connected Services/DataInputServiceReference/service1.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DataInputt/DataInputt/TimeRepo.cs b/DataInputt/DataInputt/TimeRepo.cs index e5d7c7e..195c338 100644 --- a/DataInputt/DataInputt/TimeRepo.cs +++ b/DataInputt/DataInputt/TimeRepo.cs @@ -1,5 +1,5 @@ -using DataInputt.DataInputServiceReference; -using DataInputt.Models; +using DataInputt.Models; +using DataInputt.ZeitService; using System; using System.Collections.Generic; using System.Linq; diff --git a/DataInputt/DataInputt/ZeitService/IDataInputService.cs b/DataInputt/DataInputt/ZeitService/IDataInputService.cs new file mode 100644 index 0000000..f58d753 --- /dev/null +++ b/DataInputt/DataInputt/ZeitService/IDataInputService.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; + +namespace DataInputt.ZeitService +{ + public interface IDataInputService + { + int CreateUser(User user); + + int Login(User user); + + List - - 6.3.0 - + + 10.0.3 4.5.1 + 1.0.112 diff --git a/DataInputt/DataInputt/MainWindow.xaml.cs b/DataInputt/DataInputt/MainWindow.xaml.cs index 78b5956..0d96302 100644 --- a/DataInputt/DataInputt/MainWindow.xaml.cs +++ b/DataInputt/DataInputt/MainWindow.xaml.cs @@ -908,7 +908,7 @@ private void ExPorterDB2() { using (var db = new DataContext()) { - db.Database.Delete(); + db.Database.EnsureDeleted(); foreach (Publication p in this.publikationen.Items) { //Console.WriteLine(p.Id + " " + p.Name); diff --git a/DataInputt/DataInputt/ZeitService/IDataInputService.cs b/DataInputt/DataInputt/ZeitService/IDataInputService.cs index f58d753..30d424d 100644 --- a/DataInputt/DataInputt/ZeitService/IDataInputService.cs +++ b/DataInputt/DataInputt/ZeitService/IDataInputService.cs @@ -16,6 +16,34 @@ public interface IDataInputService List Projects(); } + public class DataInputService : IDataInputService + { + public void AddTime(Time time, int userId) + { + + } + + public int CreateUser(User user) + { + return 0; + } + + public List + + + diff --git a/DataInputt/DataInputt/TimeRepo.cs b/DataInputt/DataInputt/TimeRepo.cs index 195c338..207481f 100644 --- a/DataInputt/DataInputt/TimeRepo.cs +++ b/DataInputt/DataInputt/TimeRepo.cs @@ -1,5 +1,6 @@ using DataInputt.Models; using DataInputt.ZeitService; +using DataInputt.ZeitService.Api; using System; using System.Collections.Generic; using System.Linq; diff --git a/DataInputt/DataInputt/ZeitService/IDataInputService.cs b/DataInputt/DataInputt/ZeitService/IDataInputService.cs index 30d424d..40b5663 100644 --- a/DataInputt/DataInputt/ZeitService/IDataInputService.cs +++ b/DataInputt/DataInputt/ZeitService/IDataInputService.cs @@ -1,4 +1,5 @@ -using System; +using DataInputt.ZeitService.Api; +using System; using System.Collections.Generic; namespace DataInputt.ZeitService @@ -49,18 +50,5 @@ public interface IDataCallback void EarningsCalculated(IDictionary earnings); } - public class User - { - public string Name { get; set; } - public string Passwort { get; set; } - } - - public class Time - { - public DateTime Start { get; set; } - public DateTime End { get; set; } - public string Project { get; set; } - public int uId { get; set; } - public int Id { get; set; } - } + } diff --git a/DataInputt/DataInputt/Zeiterfassung.xaml.cs b/DataInputt/DataInputt/Zeiterfassung.xaml.cs index 62f5764..38b90fc 100644 --- a/DataInputt/DataInputt/Zeiterfassung.xaml.cs +++ b/DataInputt/DataInputt/Zeiterfassung.xaml.cs @@ -18,6 +18,7 @@ using System.ServiceModel; using System.Windows.Threading; using DataInputt.ZeitService; +using DataInputt.ZeitService.Api; namespace DataInputt { From 42c49d43b0a53d7564ab8e47d57ab402cc9fc279 Mon Sep 17 00:00:00 2001 From: David Siebert Date: Mon, 14 Sep 2020 10:07:05 +0200 Subject: [PATCH 09/11] Anlage ZeitServiceController --- .../Controllers/ZeitServiceController.cs | 121 ++++++++++++++++++ DataInputt/WebApi/WebApi.csproj | 6 +- 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 DataInputt/WebApi/Controllers/ZeitServiceController.cs diff --git a/DataInputt/WebApi/Controllers/ZeitServiceController.cs b/DataInputt/WebApi/Controllers/ZeitServiceController.cs new file mode 100644 index 0000000..017bd83 --- /dev/null +++ b/DataInputt/WebApi/Controllers/ZeitServiceController.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using DataInputt.ZeitService.Api; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace WebApi.Controllers +{ + [Route("api/zeitservice")] + [ApiController] + public class ZeitServiceController : ControllerBase + { + public static List Users = new List(); + public static List