From b580b741a8cc9eb38ec3e2fe0ac88a6b93384655 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 18 Feb 2022 17:59:18 +0100 Subject: [PATCH 1/3] Fix msbuild (maybe) --- Jenkinsfile | 10 +++++----- SteamWareLib/SteamWare.csproj | 3 +++ SteamWareLib/app.config | 2 +- SteamWareLib/packages.config | 2 +- TestBench/App.config | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 35f0e57..ddaeb86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,24 +36,24 @@ pipeline { IO: { sleep 3; // Reports lib - bat "\"${tool 'MSBuild-15.0'}\" SteamWare.IO\\SteamWare.IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" SteamWare.IO\\SteamWare.IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" }, LOGGER: { sleep 5; // Reports lib - bat "\"${tool 'MSBuild-15.0'}\" SteamWare.Logger\\SteamWare.Logger.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" SteamWare.Logger\\SteamWare.Logger.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" }, MAIN_LIB: { // MAIN lib - bat "\"${tool 'MSBuild-15.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" }, REPORTS: { // Reports lib - bat "\"${tool 'MSBuild-15.0'}\" SteamWare.Reports\\SteamWare.Reports.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" SteamWare.Reports\\SteamWare.Reports.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" }, SCHEDULER: { // Reports lib - bat "\"${tool 'MSBuild-15.0'}\" Steamware.Scheduler\\SteamWare.Scheduler.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" Steamware.Scheduler\\SteamWare.Scheduler.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m" }, failFast: false) } diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index 1cbe2b1..1735e9f 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -68,6 +68,9 @@ true + + ..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll + ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll diff --git a/SteamWareLib/app.config b/SteamWareLib/app.config index df5fdef..e00c0a7 100644 --- a/SteamWareLib/app.config +++ b/SteamWareLib/app.config @@ -63,7 +63,7 @@ - + diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config index 302a84d..4a86ac9 100644 --- a/SteamWareLib/packages.config +++ b/SteamWareLib/packages.config @@ -1,6 +1,6 @@  - + diff --git a/TestBench/App.config b/TestBench/App.config index 6f66d97..d10539f 100644 --- a/TestBench/App.config +++ b/TestBench/App.config @@ -56,7 +56,7 @@ - + From edb4bd6099a77d3593e46d5479e874876fc5736b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 18 Feb 2022 18:00:41 +0100 Subject: [PATCH 2/3] Refresh nuget AIM upgrade --- SteamWareLib/SteamWare.csproj | 3 --- SteamWareLib/packages.config | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index 1735e9f..1cbe2b1 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -68,9 +68,6 @@ true - - ..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll - ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config index 4a86ac9..302a84d 100644 --- a/SteamWareLib/packages.config +++ b/SteamWareLib/packages.config @@ -1,6 +1,6 @@  - + From 025bcc7268cf86e41fc3f2ea49868b45d4a2b0da Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 18 Feb 2022 18:07:20 +0100 Subject: [PATCH 3/3] fix AIM vers 1.1.0 --- SteamWareLib/SteamWare.csproj | 19 +++++++------------ SteamWareLib/packages.config | 2 +- SteamWareLib/utils.cs | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index 1cbe2b1..5a14294 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -68,6 +68,9 @@ true + + ..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll + ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll @@ -209,12 +212,8 @@ - - ASPXCodeBehind - - - ASPXCodeBehind - + + @@ -297,9 +296,7 @@ - - ASPXCodeBehind - + True @@ -309,9 +306,7 @@ - - ASPXCodeBehind - + diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config index 302a84d..4a86ac9 100644 --- a/SteamWareLib/packages.config +++ b/SteamWareLib/packages.config @@ -1,6 +1,6 @@  - + diff --git a/SteamWareLib/utils.cs b/SteamWareLib/utils.cs index 74c9b2e..d56262c 100644 --- a/SteamWareLib/utils.cs +++ b/SteamWareLib/utils.cs @@ -1,4 +1,5 @@ using AegisImplicitMail; +using System.Net.Mail; using System; using System.Collections.Generic; using System.ComponentModel; @@ -7,7 +8,6 @@ using System.Globalization; using System.IO; using System.Linq; using System.Net; -using System.Net.Mail; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Security.Cryptography;