diff --git a/build/Build.proj b/build/Build.proj index 92f97f0ab5..5a4b2cead2 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -142,12 +142,12 @@ - 2014.11.22 - $(MSBuildThisFileDirectory)\packages\EWSoftware.SHFB.$(SHFBVersion)\tools + 2017.12.30.2 + $(MSBuildThisFileDirectory)\..\artifacts\packages\EWSoftware.SHFB.$(SHFBVersion)\tools $([MSBUILD]::Unescape($(SHFBPath)\MSBuild.Community.Tasks.dll)) $(SHFBPath) - + diff --git a/build/build-help-shfb.cmd b/build/build-help-shfb.cmd index c662713340..f73698cc76 100644 --- a/build/build-help-shfb.cmd +++ b/build/build-help-shfb.cmd @@ -1,8 +1,12 @@ echo off -rem set MSBUILD=c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe -set MSBUILD="%ProgramFiles(x86)%\MSBuild\12.0\bin\MSBuild.exe" +WHERE msbuild > nul +IF %ERRORLEVEL% NEQ 0 ( +ECHO msbuild not found. Run in the Developer Command Prompt for VS 2017 +pause +) -%MSBUILD% -t:BuildHelpShfb -p:BuildVersion=%1 Build.proj +set BUILD_DIR=%~dp0 +msbuild -t:BuildHelpShfb "%BUILD_DIR%\Build.proj" pause \ No newline at end of file diff --git a/build/help/Help.shfbproj b/build/help/Help.shfbproj index db4f669dfa..6144ffbe1c 100644 --- a/build/help/Help.shfbproj +++ b/build/help/Help.shfbproj @@ -6,10 +6,10 @@ sources --> Debug AnyCPU - $(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2014.11.22.0\tools + $(MSBuildThisFileDirectory)..\..\artifacts\packages\EWSoftware.SHFB.2017.12.30.2\tools 2.0 {130627a0-3530-4939-8d7a-c447563618d1} - 2015.6.5.0 + 2017.9.26.0 Documentation @@ -25,7 +25,7 @@ Eto.Forms documentation VS2013 - Attributes, Protected, SealedProtected, ProtectedInternalAsProtected + Attributes, Protected, SealedProtected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable Eto.Forms Cross Platform UI Framework Global platform, bindings, and helpers. @@ -39,7 +39,7 @@ OnlyWarningsAndErrors False - .NET Portable Library 4.5 + Cross-platform (.NET Core/.NET Standard) True False False @@ -66,7 +66,8 @@ %temp%\shfbworking\ - 2.1.0.0 + 2.4.0.0 + 100