diff --git a/ClickToBuild.cmd b/ClickToBuild.cmd index 75edac5ae62..920481b6971 100644 --- a/ClickToBuild.cmd +++ b/ClickToBuild.cmd @@ -3,31 +3,18 @@ REM Necessary for the InstallDir variable to work inside the MsBuild-finding loop below. SETLOCAL ENABLEDELAYEDEXPANSION -for /f "usebackq tokens=1* delims=: " %%i in (`lib\vswhere\vswhere -latest -version "[15.0,16.0)" -requires Microsoft.Component.MSBuild`) do ( +for /f "usebackq tokens=1* delims=: " %%i in (`lib\vswhere\vswhere -latest -version "[16.0,18.0)" -requires Microsoft.Component.MSBuild`) do ( if /i "%%i"=="installationPath" ( set InstallDir=%%j echo !InstallDir! - if exist "!InstallDir!\MSBuild\15.0\Bin\MSBuild.exe" ( - echo "Using MSBuild from Visual Studio 2017" - set msbuild="!InstallDir!\MSBuild\15.0\Bin\MSBuild.exe" + if exist "!InstallDir!\MSBuild\Current\Bin\MSBuild.exe" ( + echo "Using MSBuild from !InstallDir!" + set msbuild="!InstallDir!\MSBuild\Current\Bin\MSBuild.exe" goto build ) ) ) -FOR %%b in ( - "%VS140COMNTOOLS%\vsvars32.bat" - "%VS120COMNTOOLS%\vsvars32.bat" - "%VS110COMNTOOLS%\vsvars32.bat" - ) do ( - if exist %%b ( - echo "Using MSBuild from %%b" - call %%b - set msbuild="msbuild" - goto build - ) -) - echo "Unable to detect suitable environment. Build may not succeed." :build diff --git a/lib/nuget/nuget.exe b/lib/nuget/nuget.exe index 9f8781de0db..a6caf01c9e3 100644 Binary files a/lib/nuget/nuget.exe and b/lib/nuget/nuget.exe differ diff --git a/src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs index d69c0c2b901..ec17b4a1f26 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs +++ b/src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs @@ -31,7 +31,7 @@ public int Port { set { this.Store(x => x.Port, value); } } - [Obsolete($"Use {nameof(AutoSelectEncryption)} and/or {nameof(EncryptionMethod)} instead.")] + [Obsolete("Use " + nameof(AutoSelectEncryption) + " and/or "+ nameof(EncryptionMethod) + " instead.")] public bool EnableSsl => this.Retrieve(x => x.EnableSsl); public SmtpEncryptionMethod EncryptionMethod {