lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 04:32:23 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updated ClickToBuild.cmd to support VS2019 (v16) and VS2022 (v17) (#8764)

Browse Source 
Removed support for eariler MSBuild versions (they cannot compile SmtpMessageChannel.cs)

Updated lib/nuget/nuget.exe to latest version (6.9.1.3) (required for package restoration)

Modified Obsolete attribute in SmtpSettingsPart.cs so the solution builds with VS2019
This commit is contained in:
dmhiggins23 2024-03-15 05:18:40 -04:00 committed by GitHub
parent 2d7ce45d1e
commit 1900b35cd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ClickToBuild.cmd
View File

@ -3,31 +3,18 @@
REM Necessary for the InstallDir variable to work inside the MsBuild-finding loop below. REM Necessary for the InstallDir variable to work inside the MsBuild-finding loop below.
SETLOCAL ENABLEDELAYEDEXPANSION 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" ( if /i "%%i"=="installationPath" (
set InstallDir=%%j set InstallDir=%%j
echo !InstallDir! echo !InstallDir!
if exist "!InstallDir!\MSBuild\15.0\Bin\MSBuild.exe" ( if exist "!InstallDir!\MSBuild\Current\Bin\MSBuild.exe" (
echo "Using MSBuild from Visual Studio 2017" echo "Using MSBuild from !InstallDir!"
set msbuild="!InstallDir!\MSBuild\15.0\Bin\MSBuild.exe" set msbuild="!InstallDir!\MSBuild\Current\Bin\MSBuild.exe"
goto build 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." echo "Unable to detect suitable environment. Build may not succeed."
:build :build

BIN
lib/nuget/nuget.exe
View File

Binary file not shown.

2
src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs
View File

@ -31,7 +31,7 @@ namespace Orchard.Email.Models {
set { this.Store(x => x.Port, value); } 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 bool EnableSsl => this.Retrieve(x => x.EnableSsl);
public SmtpEncryptionMethod EncryptionMethod { public SmtpEncryptionMethod EncryptionMethod {