diff --git a/.gitignore b/.gitignore index f3817a78..7d5130e6 100644 --- a/.gitignore +++ b/.gitignore @@ -484,3 +484,18 @@ bin/cml/models/templates/discrete_polygon/video/python/nova_db_info bin/cml/models/templates/discrete_polygon/video/python/nova_sessions *.pth bin/data/* +bin/AWSSDK.Core.dll +bin/AWSSDK.Core.xml +bin/AWSSDK.SecurityToken.dll +bin/AWSSDK.SecurityToken.xml +bin/Microsoft.Extensions.Logging.Abstractions.dll +bin/Microsoft.Extensions.Logging.Abstractions.xml +bin/Microsoft.Bcl.AsyncInterfaces.dll +bin/Snappier.dll +bin/Snappier.xml +mongocrypt.dll +libmongocrypt.so +libmongocrypt.dylib +bin/ZstdSharp.dll +bin/Microsoft.Bcl.AsyncInterfaces.dll +bin/System.Data.SqlClient.xml diff --git a/app.config b/app.config index a0b030cf..540be220 100644 --- a/app.config +++ b/app.config @@ -15,7 +15,7 @@ - + @@ -53,6 +53,14 @@ + + + + + + + + diff --git a/bin/Microsoft.Bcl.AsyncInterfaces.dll b/bin/Microsoft.Bcl.AsyncInterfaces.dll index 869ac1b8..abe9406c 100644 Binary files a/bin/Microsoft.Bcl.AsyncInterfaces.dll and b/bin/Microsoft.Bcl.AsyncInterfaces.dll differ diff --git a/bin/nova.exe b/bin/nova.exe index 07a634ec..9c974fbe 100644 Binary files a/bin/nova.exe and b/bin/nova.exe differ diff --git a/nova.csproj b/nova.csproj index 54646dd7..4dd1dad2 100644 --- a/nova.csproj +++ b/nova.csproj @@ -65,6 +65,12 @@ Always + + packages\AWSSDK.Core.3.7.100.14\lib\net45\AWSSDK.Core.dll + + + packages\AWSSDK.SecurityToken.3.7.100.14\lib\net45\AWSSDK.SecurityToken.dll + packages\Portable.LibJpeg.NET.1.5.1.1\lib\netstandard1.0\BitMiracle.LibJpeg.NetCore.dll @@ -106,8 +112,8 @@ False References\LiveCharts.Wpf.dll - - packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll packages\Microsoft.Bcl.HashCode.1.1.0\lib\net461\Microsoft.Bcl.HashCode.dll @@ -136,6 +142,9 @@ packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll @@ -165,17 +174,17 @@ packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - packages\MongoDB.Bson.2.17.1\lib\net472\MongoDB.Bson.dll + + packages\MongoDB.Bson.2.24.0\lib\net472\MongoDB.Bson.dll - - packages\MongoDB.Driver.2.17.1\lib\net472\MongoDB.Driver.dll + + packages\MongoDB.Driver.2.24.0\lib\net472\MongoDB.Driver.dll - - packages\MongoDB.Driver.Core.2.17.1\lib\net472\MongoDB.Driver.Core.dll + + packages\MongoDB.Driver.Core.2.24.0\lib\net472\MongoDB.Driver.Core.dll - - packages\MongoDB.Libmongocrypt.1.5.5\lib\net472\MongoDB.Libmongocrypt.dll + + packages\MongoDB.Libmongocrypt.1.8.2\lib\netstandard2.0\MongoDB.Libmongocrypt.dll References\NAudio.dll @@ -222,6 +231,9 @@ False References\SharpDX.XInput.dll + + packages\Snappier.1.0.0\lib\netstandard2.0\Snappier.dll + packages\Svg.3.4.3\lib\net462\Svg.dll @@ -250,8 +262,8 @@ True True - - packages\System.Data.SqlClient.4.3.0\lib\net46\System.Data.SqlClient.dll + + packages\System.Data.SqlClient.4.8.6\lib\net461\System.Data.SqlClient.dll packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -259,8 +271,8 @@ True - - packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll + + packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll @@ -304,8 +316,8 @@ True - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll @@ -317,8 +329,8 @@ True True - - packages\System.Net.Security.4.3.0\lib\net46\System.Net.Security.dll + + packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll True True @@ -403,7 +415,7 @@ packages\System.Text.Json.4.7.2\lib\net461\System.Text.Json.dll - packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll + packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll True True @@ -456,6 +468,9 @@ False References\WriteableBitmapEx.Wpf.dll + + packages\ZstdSharp.Port.0.7.3\lib\net461\ZstdSharp.dll + @@ -1081,6 +1096,8 @@ + + SettingsSingleFileGenerator @@ -1107,6 +1124,7 @@ PreserveNewest + @@ -1136,6 +1154,9 @@ false + + + @@ -1143,16 +1164,16 @@ 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}". - - + + xcopy "$(ProjectDir)PythonScripts\*.*" "$(TargetDir)\PythonScripts" /Y /I /E - - + + \ No newline at end of file diff --git a/packages.config b/packages.config index 72ac9d81..5f3b9a15 100644 --- a/packages.config +++ b/packages.config @@ -1,5 +1,7 @@  + + @@ -13,11 +15,12 @@ - + + @@ -25,15 +28,16 @@ - - - - + + + + - + + @@ -42,11 +46,11 @@ - + - + @@ -56,11 +60,11 @@ - + - + @@ -97,4 +101,5 @@ + \ No newline at end of file