From e662a552b821ce57a6f03452a47f99f182ef1deb Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 10:52:25 +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 | 10 ---------- DataInputt/DataInputt/DataInputt.csproj | 7 ------- DataInputt/WcfServer/DataInputService.cs | 1 - DataInputt/WcfServer/IDataInputService.cs | 1 - DataInputt/WcfServer/WcfServer.csproj | 4 ---- 5 files changed, 23 deletions(-) diff --git a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj index 602c53a..fda73ab 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 - - - - @@ -58,12 +54,6 @@ - - - {5E84912A-4948-49FE-BFFF-465A7FDC2C1C} - DataInputt - - 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 d0af4b70e9ed8ee5a284f2abb402bc8630fa9cbe Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 10:55:39 +0200 Subject: [PATCH 02/11] Packages.config in PackageReference wandeln --- .../DataInputt.Tests/DataInputt.Tests.csproj | 22 +- DataInputt/DataInputt/App.config | 13 +- DataInputt/DataInputt/DataInputt.csproj | 52 ++-- .../adc38733/DataInputt/DataInputt.csproj | 265 ++++++++++++++++++ .../adc38733/DataInputt/NuGetUpgradeLog.html | 166 +++++++++++ .../adc38733}/DataInputt/packages.config | 0 .../DataInputt.Tests/DataInputt.Tests.csproj | 67 +++++ .../DataInputt.Tests/NuGetUpgradeLog.html | 163 +++++++++++ .../DataInputt.Tests/packages.config | 0 9 files changed, 687 insertions(+), 61 deletions(-) create mode 100644 DataInputt/MigrationBackup/adc38733/DataInputt/DataInputt.csproj create mode 100644 DataInputt/MigrationBackup/adc38733/DataInputt/NuGetUpgradeLog.html rename DataInputt/{ => MigrationBackup/adc38733}/DataInputt/packages.config (100%) create mode 100644 DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/DataInputt.Tests.csproj create mode 100644 DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/NuGetUpgradeLog.html rename DataInputt/{ => MigrationBackup/dd1043d0}/DataInputt.Tests/packages.config (100%) diff --git a/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/DataInputt.Tests/DataInputt.Tests.csproj index fda73ab..9a9726f 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 - @@ -52,16 +45,13 @@ - + + 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/adc38733/DataInputt/DataInputt.csproj b/DataInputt/MigrationBackup/adc38733/DataInputt/DataInputt.csproj new file mode 100644 index 0000000..5e9259f --- /dev/null +++ b/DataInputt/MigrationBackup/adc38733/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/adc38733/DataInputt/NuGetUpgradeLog.html b/DataInputt/MigrationBackup/adc38733/DataInputt/NuGetUpgradeLog.html new file mode 100644 index 0000000..5997a93 --- /dev/null +++ b/DataInputt/MigrationBackup/adc38733/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-grpc2\DataInputt\MigrationBackup\adc38733\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/adc38733/DataInputt/packages.config similarity index 100% rename from DataInputt/DataInputt/packages.config rename to DataInputt/MigrationBackup/adc38733/DataInputt/packages.config diff --git a/DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/DataInputt.Tests.csproj b/DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/DataInputt.Tests.csproj new file mode 100644 index 0000000..fda73ab --- /dev/null +++ b/DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/DataInputt.Tests.csproj @@ -0,0 +1,67 @@ + + + + + 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 + + + + + + + + + + + + + + + + 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/dd1043d0/DataInputt.Tests/NuGetUpgradeLog.html b/DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/NuGetUpgradeLog.html new file mode 100644 index 0000000..f5095f1 --- /dev/null +++ b/DataInputt/MigrationBackup/dd1043d0/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-grpc2\DataInputt\MigrationBackup\dd1043d0\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/dd1043d0/DataInputt.Tests/packages.config similarity index 100% rename from DataInputt/DataInputt.Tests/packages.config rename to DataInputt/MigrationBackup/dd1043d0/DataInputt.Tests/packages.config From ee07211245a05667262e478143bb47a8fbd43c64 Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 10:59:53 +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 9a9726f..0b30921 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..f817c61 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.8.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); From 7f544386f5044c31d24a2764df10e30cdb477de6 Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 11:02:17 +0200 Subject: [PATCH 04/11] Umstellung *.csproj auf .NET 5.0 / nicht kompilierbar --- DataInputt/DataInputt/DataInputt.csproj | 234 +----------------------- 1 file changed, 8 insertions(+), 226 deletions(-) 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 2ddb3e28391f6b56828d6f313f74bea3d7ac69d3 Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 12:23:16 +0200 Subject: [PATCH 05/11] =?UTF-8?q?Kompilierf=C3=A4higkeit=20wiederhergestel?= =?UTF-8?q?lt.=20Entfernen=20vom=20WCF=20Service=20Verweis.=20Anlage=20ein?= =?UTF-8?q?es=20Dummy=20Service=20und=20eines=20Shared=20ZeitService.Api?= =?UTF-8?q?=20Projekt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataInputt.ZeitService.Api.csproj | 7 + .../IDataInputService.cs | 43 ++ DataInputt/DataInputt.sln | 6 + .../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/DataInputt.csproj | 5 +- .../DataInputt/Services/DataInputService.cs | 38 ++ DataInputt/DataInputt/TimeRepo.cs | 4 +- DataInputt/DataInputt/Zeiterfassung.xaml.cs | 14 +- 17 files changed, 107 insertions(+), 1318 deletions(-) create mode 100644 DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj create mode 100644 DataInputt/DataInputt.ZeitService.Api/IDataInputService.cs 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/Services/DataInputService.cs diff --git a/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj b/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj new file mode 100644 index 0000000..9f5c4f4 --- /dev/null +++ b/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/DataInputt/DataInputt.ZeitService.Api/IDataInputService.cs b/DataInputt/DataInputt.ZeitService.Api/IDataInputService.cs new file mode 100644 index 0000000..2c8003d --- /dev/null +++ b/DataInputt/DataInputt.ZeitService.Api/IDataInputService.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; + +namespace DataInputt.ZeitService.Api +{ + 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); From fe35360683bebfb0c1a39f42e3bb018dd9c8a42e Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 12:42:26 +0200 Subject: [PATCH 07/11] Anlage *.proto Datei --- .../DataInputt.ZeitService.Api.csproj | 12 ++++- .../ProtoZeitService.proto | 49 +++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 DataInputt/DataInputt.ZeitService.Api/ProtoZeitService.proto diff --git a/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj b/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj index 9f5c4f4..cf2f666 100644 --- a/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj +++ b/DataInputt/DataInputt.ZeitService.Api/DataInputt.ZeitService.Api.csproj @@ -1,7 +1,17 @@ - + netstandard2.0 + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/DataInputt/DataInputt.ZeitService.Api/ProtoZeitService.proto b/DataInputt/DataInputt.ZeitService.Api/ProtoZeitService.proto new file mode 100644 index 0000000..cc8072c --- /dev/null +++ b/DataInputt/DataInputt.ZeitService.Api/ProtoZeitService.proto @@ -0,0 +1,49 @@ +syntax = "proto3"; + +import "google/protobuf/timestamp.proto"; +import "google/protobuf/Empty.proto"; + +option csharp_namespace = "DataInputt.ZeitService.Api"; + +service ZeitService { + rpc CreateUser (UserDto) returns (UserResponse) {} + rpc Login (UserDto) returns (UserResponse) {} + rpc GetTimes (GetTimesRequest) returns (TimeCollection) {} + rpc AddTime (AddTimeRequest) returns (google.protobuf.Empty) {} + rpc Projects (google.protobuf.Empty) returns (ProjectCollection) {} +} + + +message UserDto { + string name = 1; + string passwort = 2; +} + +message TimeDto { + google.protobuf.Timestamp start = 1; + google.protobuf.Timestamp end = 2; + string project = 3; + int32 uid = 4; + int32 id = 5; +} + +message UserResponse { + int32 id = 1; +} + +message GetTimesRequest { + int32 userId = 1; +} + +message TimeCollection { + repeated TimeDto times = 1; +} + +message AddTimeRequest { + TimeDto time = 1; + int32 userId = 2; +} + +message ProjectCollection { + repeated string projects = 1; +} From cb86fb93e5cbd7cfd8f74bcde7b9abf7905ca9ce Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 12:45:59 +0200 Subject: [PATCH 08/11] Anlage gRPC Server Projekt --- DataInputt/DataInputt.sln | 6 ++++++ DataInputt/gRpcServer/Program.cs | 24 ++++++++++++++++++++++++ DataInputt/gRpcServer/gRpcServer.csproj | 12 ++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 DataInputt/gRpcServer/Program.cs create mode 100644 DataInputt/gRpcServer/gRpcServer.csproj diff --git a/DataInputt/DataInputt.sln b/DataInputt/DataInputt.sln index 514df4e..f3d5e6e 100644 --- a/DataInputt/DataInputt.sln +++ b/DataInputt/DataInputt.sln @@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfServer", "WcfServer\WcfS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataInputt.ZeitService.Api", "DataInputt.ZeitService.Api\DataInputt.ZeitService.Api.csproj", "{A8BD5AA6-AD86-43EF-8E17-F2D3BBC8BCE3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gRpcServer", "gRpcServer\gRpcServer.csproj", "{AC8A4837-D6FB-482C-AFAC-8F5E356D7B46}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,6 +38,10 @@ Global {A8BD5AA6-AD86-43EF-8E17-F2D3BBC8BCE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8BD5AA6-AD86-43EF-8E17-F2D3BBC8BCE3}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8BD5AA6-AD86-43EF-8E17-F2D3BBC8BCE3}.Release|Any CPU.Build.0 = Release|Any CPU + {AC8A4837-D6FB-482C-AFAC-8F5E356D7B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AC8A4837-D6FB-482C-AFAC-8F5E356D7B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AC8A4837-D6FB-482C-AFAC-8F5E356D7B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC8A4837-D6FB-482C-AFAC-8F5E356D7B46}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DataInputt/gRpcServer/Program.cs b/DataInputt/gRpcServer/Program.cs new file mode 100644 index 0000000..ebbeecb --- /dev/null +++ b/DataInputt/gRpcServer/Program.cs @@ -0,0 +1,24 @@ +using Grpc.Core; +using System; + +namespace gRpcServer +{ + class Program + { + static void Main(string[] args) + { + const int port = 9000; + const string host = "0.0.0.0"; + + Server server = new Server + { + Ports = { new ServerPort(host, port, ServerCredentials.Insecure) } + }; + server.Start(); + + Console.WriteLine($"Starting server {host}:{port}"); + Console.WriteLine("Press any key to stop..."); + Console.ReadKey(); + } + } +} diff --git a/DataInputt/gRpcServer/gRpcServer.csproj b/DataInputt/gRpcServer/gRpcServer.csproj new file mode 100644 index 0000000..8ad95b6 --- /dev/null +++ b/DataInputt/gRpcServer/gRpcServer.csproj @@ -0,0 +1,12 @@ + + + + Exe + net5.0 + + + + + + + From 3e2b28e6b34151ba12b1a6e8c03a7153f01ee36a Mon Sep 17 00:00:00 2001 From: David Siebert Date: Tue, 29 Sep 2020 13:16:18 +0200 Subject: [PATCH 09/11] Implementierung gRPC Service --- .../MappingExtensions.cs | 47 +++++++++++ DataInputt/gRpcServer/Program.cs | 1 + DataInputt/gRpcServer/ZeitService.cs | 83 +++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 DataInputt/DataInputt.ZeitService.Api/MappingExtensions.cs create mode 100644 DataInputt/gRpcServer/ZeitService.cs diff --git a/DataInputt/DataInputt.ZeitService.Api/MappingExtensions.cs b/DataInputt/DataInputt.ZeitService.Api/MappingExtensions.cs new file mode 100644 index 0000000..6e681cb --- /dev/null +++ b/DataInputt/DataInputt.ZeitService.Api/MappingExtensions.cs @@ -0,0 +1,47 @@ +namespace DataInputt.ZeitService.Api +{ + public static class MappingExtensions + { + public static User ToUser(this UserDto userDto) + { + return new User + { + Name = userDto.Name, + Passwort = userDto.Passwort + }; + } + + public static UserDto ToUserDto(this User user) + { + return new UserDto + { + Name = user.Name, + Passwort = user.Passwort + }; + } + + public static TimeDto ToTimeDto(this Time time) + { + return new TimeDto + { + Start = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(time.Start.ToUniversalTime()), + End = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(time.End.ToUniversalTime()), + Project = time.Project, + Uid = time.uId, + Id = time.Id + }; + } + + public static Time ToTime(this TimeDto timeDto) + { + return new Time + { + Start = timeDto.Start.ToDateTime(), + End = timeDto.End.ToDateTime(), + Project = timeDto.Project, + uId = timeDto.Uid, + Id = timeDto.Id + }; + } + } +} diff --git a/DataInputt/gRpcServer/Program.cs b/DataInputt/gRpcServer/Program.cs index ebbeecb..b08480d 100644 --- a/DataInputt/gRpcServer/Program.cs +++ b/DataInputt/gRpcServer/Program.cs @@ -12,6 +12,7 @@ static void Main(string[] args) Server server = new Server { + Services = { DataInputt.ZeitService.Api.ZeitService.BindService(new ZeitService()) }, Ports = { new ServerPort(host, port, ServerCredentials.Insecure) } }; server.Start(); diff --git a/DataInputt/gRpcServer/ZeitService.cs b/DataInputt/gRpcServer/ZeitService.cs new file mode 100644 index 0000000..e2a620b --- /dev/null +++ b/DataInputt/gRpcServer/ZeitService.cs @@ -0,0 +1,83 @@ +using DataInputt.ZeitService.Api; +using Google.Protobuf.WellKnownTypes; +using Grpc.Core; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace gRpcServer +{ + public class ZeitService : DataInputt.ZeitService.Api.ZeitService.ZeitServiceBase + { + public static List Users = new List(); + public static List