From b2a9d46c4d7af2aaa936c7ac37b226cc51e5ae6c Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Mon, 23 May 2022 15:15:23 +0200 Subject: [PATCH] Update to net6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sqlite unterstützung hinzugefügt --- ConsoleApplication/ConsoleApplication.csproj | 2 +- ConsoleApplication/Program.cs | 4 ++-- DPGetDataContract/DPGetDataContract.csproj | 2 +- DataGenTests/DataGenTests.csproj | 2 +- DataStoring.CSV/DataStoring.CSV.csproj | 2 +- .../DataStoring.Contract.csproj | 2 +- DataStoring.EfCore/DPContext.cs | 3 ++- DataStoring.EfCore/DataStoring.EfCore.csproj | 9 +++++---- DataStoring.EfCore/Datenbank.db | Bin 0 -> 49152 bytes .../DichtheitManagement.Contract.csproj | 2 +- DichtheitManagement/DichtheitManagement.csproj | 2 +- .../DichtheitsprüfungTerminal.csproj | 2 +- GuiWPF/GuiWPF.csproj | 2 +- GuiWPF_ViewModel/GuiWPF_ViewModel.csproj | 2 +- Mappings/Mappings.csproj | 2 +- Models/Models.csproj | 2 +- ProtokollWriter/ProtokollWriter.csproj | 2 +- .../ProtokollWriterContract.csproj | 2 +- 18 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 DataStoring.EfCore/Datenbank.db diff --git a/ConsoleApplication/ConsoleApplication.csproj b/ConsoleApplication/ConsoleApplication.csproj index 78886ba..002c78d 100644 --- a/ConsoleApplication/ConsoleApplication.csproj +++ b/ConsoleApplication/ConsoleApplication.csproj @@ -21,7 +21,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/ConsoleApplication/Program.cs b/ConsoleApplication/Program.cs index 084f9c1..daee2c9 100644 --- a/ConsoleApplication/Program.cs +++ b/ConsoleApplication/Program.cs @@ -22,7 +22,7 @@ namespace ConsoleApplication var manager = kernel.Get(); var baustellen = kernel.Get(); - /* + Auftraggeber auftraggeber = new Auftraggeber(); auftraggeber.Baustellen = new List(); auftraggeber.Baustellen.Add(new Bauvorhaben() @@ -41,7 +41,7 @@ namespace ConsoleApplication var auftragger = manager.GetAllAuftraggeber(); var bau = baustellen.GetAllBauvorhaben(); - */ + Debugger.Break(); /* diff --git a/DPGetDataContract/DPGetDataContract.csproj b/DPGetDataContract/DPGetDataContract.csproj index ca4ecaa..e854c60 100644 --- a/DPGetDataContract/DPGetDataContract.csproj +++ b/DPGetDataContract/DPGetDataContract.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + net6.0 diff --git a/DataGenTests/DataGenTests.csproj b/DataGenTests/DataGenTests.csproj index 97902e8..84d3ecd 100644 --- a/DataGenTests/DataGenTests.csproj +++ b/DataGenTests/DataGenTests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 false diff --git a/DataStoring.CSV/DataStoring.CSV.csproj b/DataStoring.CSV/DataStoring.CSV.csproj index 9035512..7a15881 100644 --- a/DataStoring.CSV/DataStoring.CSV.csproj +++ b/DataStoring.CSV/DataStoring.CSV.csproj @@ -6,7 +6,7 @@ - netstandard2.0 + net6.0 diff --git a/DataStoring.Contract/DataStoring.Contract.csproj b/DataStoring.Contract/DataStoring.Contract.csproj index 500c098..fd430a0 100644 --- a/DataStoring.Contract/DataStoring.Contract.csproj +++ b/DataStoring.Contract/DataStoring.Contract.csproj @@ -5,7 +5,7 @@ - netstandard2.0 + net6.0 diff --git a/DataStoring.EfCore/DPContext.cs b/DataStoring.EfCore/DPContext.cs index 07b3aa2..23aed4c 100644 --- a/DataStoring.EfCore/DPContext.cs +++ b/DataStoring.EfCore/DPContext.cs @@ -24,7 +24,8 @@ namespace DataStoring.EfCore protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - optionsBuilder.UseNpgsql("Host = 192.168.1.195; Database = DP; Username = DP; Password = DP"); + //optionsBuilder.UseNpgsql("Host = 192.168.1.195; Database = DP; Username = DP; Password = DP"); + optionsBuilder.UseSqlite($"Data Source=Datenbank.db"); } } } diff --git a/DataStoring.EfCore/DataStoring.EfCore.csproj b/DataStoring.EfCore/DataStoring.EfCore.csproj index b8f11db..5b92ff8 100644 --- a/DataStoring.EfCore/DataStoring.EfCore.csproj +++ b/DataStoring.EfCore/DataStoring.EfCore.csproj @@ -1,16 +1,17 @@ - netcoreapp3.1 + net6.0 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + diff --git a/DataStoring.EfCore/Datenbank.db b/DataStoring.EfCore/Datenbank.db new file mode 100644 index 0000000000000000000000000000000000000000..96e61e1372795d14b7c7a541bbf47642ec728f5e GIT binary patch literal 49152 zcmeI)O;6)S7zc1Wychy$R#mGUdg#b3qKFDXwk++f0ZeNV5;n>1vWF@%@c=GKOr1&h zMd~5Tw*4Z#_SSo)_8atAsnULeo_p+Lhip8yLq$)keD zxv1}0-EUp*+&bZH(~cA_?pBOK&0uC}&p2lKf3?yURk6cum#aUFU7p2usvLm`EW(y^GrrICjHc)}I@faK08mdu=%J6KVBTZ350 zup@Z0*$<}BJr$mHcE(S*XWCNPd@LHNxGp#Cha=VS3LJZRK5Bjn5vPsk=r1C2T<>|}hbb8# zvCfd;O`ra?zGfWLMSjGEendwJBuAcWcN^jn_d0ZM80nTy%}mYazS>rm;D)L5O_QG7 z>sD8|!G1mQIQ7lMkEiHnd(OY%&d@8B{YA^%{M<<$rThux)PNU*A~Yx~odHHuCqj=*uHVI99Xa zwpxw|YWZL4r?S5)+1K;~8w4N#0SG_<0uX=z1Rwwb2tWV=Z=(R4GSr)X6Oj6F%9tNk zi2oA6|Nfu;(?2!{KmY;|fB*y_009U<00Izz00hQZ0MGwpoLrn51Rwwb2tWV=5P$## zAOHafK;T*c&;J+-5P$##AOHafKmY;|fB*y_0DD^N+KK00bZa0SG_<0uX=z1Rwx`$q>Nv|77GDX9)oaKmY;|fB*y_ n009U<00NUOfam|o&Ogo`0uX=z1Rwwb2tWV=5P$##CPUy~%lX3B literal 0 HcmV?d00001 diff --git a/DichtheitManagement.Contract/DichtheitManagement.Contract.csproj b/DichtheitManagement.Contract/DichtheitManagement.Contract.csproj index 6084dbc..015b8ce 100644 --- a/DichtheitManagement.Contract/DichtheitManagement.Contract.csproj +++ b/DichtheitManagement.Contract/DichtheitManagement.Contract.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/DichtheitManagement/DichtheitManagement.csproj b/DichtheitManagement/DichtheitManagement.csproj index a3cd123..cf889d3 100644 --- a/DichtheitManagement/DichtheitManagement.csproj +++ b/DichtheitManagement/DichtheitManagement.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 diff --git a/DichtheitsprüfungTerminal/DichtheitsprüfungTerminal.csproj b/DichtheitsprüfungTerminal/DichtheitsprüfungTerminal.csproj index dbe7889..5e8831b 100644 --- a/DichtheitsprüfungTerminal/DichtheitsprüfungTerminal.csproj +++ b/DichtheitsprüfungTerminal/DichtheitsprüfungTerminal.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 diff --git a/GuiWPF/GuiWPF.csproj b/GuiWPF/GuiWPF.csproj index 2975bef..3356d60 100644 --- a/GuiWPF/GuiWPF.csproj +++ b/GuiWPF/GuiWPF.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true diff --git a/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj b/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj index 9f5c4f4..efc79fa 100644 --- a/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj +++ b/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net6.0 diff --git a/Mappings/Mappings.csproj b/Mappings/Mappings.csproj index 7fda3fc..51312db 100644 --- a/Mappings/Mappings.csproj +++ b/Mappings/Mappings.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/Models/Models.csproj b/Models/Models.csproj index 9f5c4f4..efc79fa 100644 --- a/Models/Models.csproj +++ b/Models/Models.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net6.0 diff --git a/ProtokollWriter/ProtokollWriter.csproj b/ProtokollWriter/ProtokollWriter.csproj index 234a30e..c44a7c4 100644 --- a/ProtokollWriter/ProtokollWriter.csproj +++ b/ProtokollWriter/ProtokollWriter.csproj @@ -12,7 +12,7 @@ - netstandard2.0 + net6.0 diff --git a/ProtokollWriterContract/ProtokollWriterContract.csproj b/ProtokollWriterContract/ProtokollWriterContract.csproj index 500c098..fd430a0 100644 --- a/ProtokollWriterContract/ProtokollWriterContract.csproj +++ b/ProtokollWriterContract/ProtokollWriterContract.csproj @@ -5,7 +5,7 @@ - netstandard2.0 + net6.0