diff --git a/Dakota/Dakota.csproj b/Dakota/Dakota.csproj index 7a1588f77..bd6ac875f 100644 --- a/Dakota/Dakota.csproj +++ b/Dakota/Dakota.csproj @@ -34,36 +34,23 @@ x64 - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + False + ..\Lib\System.Memory.dll ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + False + ..\Lib\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + ..\packages\System.Text.Json.9.0.2\lib\net462\System.Text.Json.dll diff --git a/Dakota/app.config b/Dakota/app.config index 993230c61..b949327f8 100644 --- a/Dakota/app.config +++ b/Dakota/app.config @@ -18,10 +18,6 @@ - - - - @@ -52,7 +48,7 @@ - + @@ -62,6 +58,10 @@ + + + + \ No newline at end of file diff --git a/Dakota/packages.config b/Dakota/packages.config index f4e3ddffb..73a09538b 100644 --- a/Dakota/packages.config +++ b/Dakota/packages.config @@ -1,12 +1,13 @@  - + + - - + + \ No newline at end of file diff --git a/DakotaUnitTest/DakotaReaderUnitTest.cs b/DakotaUnitTest/DakotaReaderUnitTest.cs index 3a83dd43e..f60739095 100644 --- a/DakotaUnitTest/DakotaReaderUnitTest.cs +++ b/DakotaUnitTest/DakotaReaderUnitTest.cs @@ -53,11 +53,11 @@ namespace DakotaUnitTest Assert.IsNotNull(test); - Assert.IsTrue(test.Item1 == "661430035"); + Assert.IsTrue(test.IKKrankenkasse == "661430035"); - Assert.IsTrue(test.Item2 == "106492406"); + Assert.IsTrue(test.IKKostentrager == "106492406"); - Assert.IsTrue(test.Item3 == "105328415"); + Assert.IsTrue(test.IKDatenannahmestelle == "105328415"); } [TestMethod] @@ -67,11 +67,11 @@ namespace DakotaUnitTest Assert.IsNotNull(test); - Assert.IsTrue(test.Item1 == "104212516"); + Assert.IsTrue(test.IKKrankenkasse == "104212516"); - Assert.IsTrue(test.Item2 == "104212505"); + Assert.IsTrue(test.IKKostentrager == "104212505"); - Assert.IsTrue(test.Item3 == "104212505"); + Assert.IsTrue(test.IKDatenannahmestelle == "104212505"); } [TestMethod] @@ -89,11 +89,11 @@ namespace DakotaUnitTest Assert.IsNotNull(test); - Assert.IsTrue(test.Item1 == "109905003"); + Assert.IsTrue(test.IKKrankenkasse == "109905003"); - Assert.IsTrue(test.Item2 == "109905003"); + Assert.IsTrue(test.IKKostentrager == "109905003"); - Assert.IsTrue(test.Item3 == "109905003"); + Assert.IsTrue(test.IKDatenannahmestelle == "109905003"); } } } diff --git a/Host/GkvAbrechnungServer.aspx.cs b/Host/GkvAbrechnungServer.aspx.cs index b54b34166..340494250 100644 --- a/Host/GkvAbrechnungServer.aspx.cs +++ b/Host/GkvAbrechnungServer.aspx.cs @@ -87,6 +87,11 @@ namespace Host if(ex.InnerException != null) { ex_text += "\n\n" + ex.InnerException.Message + "\n\n" + ex.InnerException.StackTrace; + + if (ex.InnerException.InnerException != null) + { + ex_text += "\n\n" + ex.InnerException.InnerException.Message + "\n\n" + ex.InnerException.InnerException.StackTrace; + } } SendErrorResponse("Exception: " + ex_text); @@ -266,6 +271,8 @@ namespace Host (response.Datenaustauschreferenz, response.Transfernummer) = manager.GetNextNumber(req.IKDatenannahmestelle, req.NewDatenaustauschRef); + response.Success = true; + SendResponse(response); return; diff --git a/Host/Host.csproj b/Host/Host.csproj index b00d156a8..b7da36ee3 100644 --- a/Host/Host.csproj +++ b/Host/Host.csproj @@ -98,8 +98,8 @@ - - ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.11\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll @@ -151,8 +151,12 @@ + + ..\packages\System.IO.Pipelines.9.0.11\lib\net462\System.IO.Pipelines.dll + - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + False + ..\Lib\System.Memory.dll @@ -169,14 +173,11 @@ ..\packages\System.Text.Encoding.CodePages.9.0.2\lib\net462\System.Text.Encoding.CodePages.dll - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.9.0.11\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Text.Json.9.0.2\lib\net462\System.Text.Json.dll ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 3adc24b9f..18dae3adc 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml true - Release|Any CPU + Debug|Any CPU diff --git a/Host/Web.Deploy.config b/Host/Web.Deploy.config index 8a0d659f3..e17f5e268 100644 --- a/Host/Web.Deploy.config +++ b/Host/Web.Deploy.config @@ -25,12 +25,64 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Host/Web.config b/Host/Web.config index 280553457..a1ddeddd8 100644 --- a/Host/Web.config +++ b/Host/Web.config @@ -25,11 +25,11 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -77,11 +77,11 @@ - + - + diff --git a/Host/packages.config b/Host/packages.config index e9c880843..4fc24c980 100644 --- a/Host/packages.config +++ b/Host/packages.config @@ -3,7 +3,7 @@ - + @@ -21,13 +21,14 @@ + - - + + \ No newline at end of file diff --git a/Lib/Microsoft.Bcl.AsyncInterfaces.dll b/Lib/Microsoft.Bcl.AsyncInterfaces.dll deleted file mode 100644 index cf06e021e..000000000 Binary files a/Lib/Microsoft.Bcl.AsyncInterfaces.dll and /dev/null differ diff --git a/Lib/System.IO.Pipelines.dll b/Lib/System.IO.Pipelines.dll deleted file mode 100644 index 8fab8c635..000000000 Binary files a/Lib/System.IO.Pipelines.dll and /dev/null differ diff --git a/Lib/System.Text.Encodings.Web.dll b/Lib/System.Text.Encodings.Web.dll deleted file mode 100644 index 5518dbebb..000000000 Binary files a/Lib/System.Text.Encodings.Web.dll and /dev/null differ diff --git a/Lib/System.Text.Json.dll b/Lib/System.Text.Json.dll deleted file mode 100644 index a931ec07d..000000000 Binary files a/Lib/System.Text.Json.dll and /dev/null differ diff --git a/Report/app.config b/Report/app.config index 07ce74d83..0678b5bb0 100644 --- a/Report/app.config +++ b/Report/app.config @@ -70,6 +70,10 @@ + + + + diff --git a/ReportService/app.config b/ReportService/app.config index 92ee995e1..bfb9007f5 100644 --- a/ReportService/app.config +++ b/ReportService/app.config @@ -62,6 +62,10 @@ + + + + diff --git a/Service/app.config b/Service/app.config index 9c0be0903..e0d3afbb7 100644 --- a/Service/app.config +++ b/Service/app.config @@ -74,6 +74,10 @@ + + + +