diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index beb4701..58dbdb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,13 +9,22 @@ variables: # helper x fix pacchetti nuget da repo locale nexus.steamware.net .nuget-fix: &nuget-fix - | - $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C - if ($hasSource -eq 0) { - C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`"" - } else { - C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`"" + echo "esecuzione Nuget FIX steps" + dotnet nuget list source + $hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus Proxy" + if (! [String]::IsNullOrWhiteSpace($hasSource)) { + dotnet nuget remove source "`"Steamware Nexus Proxy`"" } - echo $hasSource + $hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus" + if (! [String]::IsNullOrWhiteSpace($hasSource)) { + dotnet nuget remove source "`"Steamware Nexus`"" + } + $hasSource = dotnet nuget list source | Select-String -Pattern "nexus-proxy-v3" + if (! [String]::IsNullOrWhiteSpace($hasSource)) { + dotnet nuget remove source nexus-proxy-v3 + } + dotnet nuget add source https://nexus.steamware.net/repository/nuget-group-3/index.json -n "Steamware Nexus" -u nugetUser -p $NEXUS_PASSWD --store-password-in-clear-text + echo "Steamware Nexus Source added" # helper creazione hash files .hashBuild: &hashBuild diff --git a/EgwProxy.DataLayer/App.config b/EgwProxy.DataLayer/App.config index 10ebf98..53c1413 100644 --- a/EgwProxy.DataLayer/App.config +++ b/EgwProxy.DataLayer/App.config @@ -7,19 +7,63 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EgwProxy.DataLayer/EgwProxy.DataLayer.csproj b/EgwProxy.DataLayer/EgwProxy.DataLayer.csproj index d28f771..ab38586 100644 --- a/EgwProxy.DataLayer/EgwProxy.DataLayer.csproj +++ b/EgwProxy.DataLayer/EgwProxy.DataLayer.csproj @@ -34,8 +34,8 @@ 4 - - ..\packages\BouncyCastle.1.8.3.1\lib\BouncyCastle.Crypto.dll + + ..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -43,23 +43,26 @@ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.26.1\lib\net45\Google.Protobuf.dll - - ..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll + + ..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll - - ..\packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll + + ..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll - - ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll + + ..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll - - ..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll + + ..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll + + + ..\packages\MySql.Data.EntityFramework.8.3.0\lib\net462\MySql.Data.EntityFramework.dll ..\packages\NLog.5.2.8\lib\net46\NLog.dll @@ -69,28 +72,40 @@ - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll + + + ..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll + - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + @@ -98,11 +113,8 @@ - - ..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll - - - ..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll + + ..\packages\ZstdSharp.Port.0.8.0\lib\net462\ZstdSharp.dll diff --git a/EgwProxy.DataLayer/packages.config b/EgwProxy.DataLayer/packages.config index 0a59926..387560a 100644 --- a/EgwProxy.DataLayer/packages.config +++ b/EgwProxy.DataLayer/packages.config @@ -1,17 +1,23 @@  - + - - - - - - + + + + + + + - - - - + + + + + + + + + \ No newline at end of file diff --git a/TestConsoleApp/App.config b/TestConsoleApp/App.config index 4142046..b739027 100644 --- a/TestConsoleApp/App.config +++ b/TestConsoleApp/App.config @@ -17,6 +17,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file