Update shfb

picoe · Feb 16, 2018 · ec35e20 · ec35e20
1 parent bfd1614
commit ec35e20
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 12 deletions.
diff --git a/build/Build.proj b/build/Build.proj
@@ -142,12 +142,12 @@
 
 	<Target Name="BuildHelpShfb" DependsOnTargets="Build">
 		<PropertyGroup>
-        	<SHFBVersion>2014.11.22</SHFBVersion>
-			<SHFBPath>$(MSBuildThisFileDirectory)\packages\EWSoftware.SHFB.$(SHFBVersion)\tools</SHFBPath>
+        	<SHFBVersion>2017.12.30.2</SHFBVersion>
+			<SHFBPath>$(MSBuildThisFileDirectory)\..\artifacts\packages\EWSoftware.SHFB.$(SHFBVersion)\tools</SHFBPath>
 		    <SHFBLib>$([MSBUILD]::Unescape($(SHFBPath)\MSBuild.Community.Tasks.dll))</SHFBLib>
 			<SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(SHFBPath)</SHFBROOT>
 		</PropertyGroup>
-  		<Exec Command="nuget install EWSoftware.SHFB -OutputDirectory packages" Condition="! Exists('$(SHFBPath)')" />
+  		<Exec Command='nuget install EWSoftware.SHFB -OutputDirectory "$(MSBuildThisFileDirectory)\..\artifacts\packages"' Condition="! Exists('$(SHFBPath)')" />
 
     	<MSBuild Projects="$(MSBuildThisFileDirectory)\help\Help.shfbproj" Properties="Configuration=$(Configuration)" />
 	</Target>

diff --git 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
diff --git a/build/help/Help.shfbproj b/build/help/Help.shfbproj
@@ -6,10 +6,10 @@
          sources -->
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2014.11.22.0\tools</SHFBROOT>
+    <SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\..\artifacts\packages\EWSoftware.SHFB.2017.12.30.2\tools</SHFBROOT>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{130627a0-3530-4939-8d7a-c447563618d1}</ProjectGuid>
-    <SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
+    <SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
@@ -25,7 +25,7 @@
     </DocumentationSources>
     <HelpTitle>Eto.Forms documentation</HelpTitle>
     <PresentationStyle>VS2013</PresentationStyle>
-    <VisibleItems>Attributes, Protected, SealedProtected, ProtectedInternalAsProtected</VisibleItems>
+    <VisibleItems>Attributes, Protected, SealedProtected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable</VisibleItems>
     <ProjectSummary>Eto.Forms Cross Platform UI Framework</ProjectSummary>
     <NamespaceSummaries>
       <NamespaceSummaryItem name="Eto" isDocumented="True">Global platform, bindings, and helpers.</NamespaceSummaryItem>
@@ -39,7 +39,7 @@
     </PlugInConfigurations>
     <BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
     <IndentHtml>False</IndentHtml>
-    <FrameworkVersion>.NET Portable Library 4.5</FrameworkVersion>
+    <FrameworkVersion>Cross-platform (.NET Core/.NET Standard)</FrameworkVersion>
     <KeepLogFile>True</KeepLogFile>
     <DisableCodeBlockComponent>False</DisableCodeBlockComponent>
     <CppCommentsFixup>False</CppCommentsFixup>
@@ -66,7 +66,8 @@
       </Filter>
     </ApiFilter>
     <WorkingPath>%temp%\shfbworking\</WorkingPath>
-    <HelpFileVersion>2.1.0.0</HelpFileVersion>
+    <HelpFileVersion>2.4.0.0</HelpFileVersion>
+    <SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
   </PropertyGroup>
   <!-- There are no properties for these groups.  AnyCPU needs to appear in
        order for Visual Studio to perform the build.  The others are optional

diff --git a/build/help/Help.sln b/build/help/Help.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2026
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "Help", "Help.shfbproj", "{130627A0-3530-4939-8D7A-C447563618D1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{130627A0-3530-4939-8D7A-C447563618D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{130627A0-3530-4939-8D7A-C447563618D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{130627A0-3530-4939-8D7A-C447563618D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{130627A0-3530-4939-8D7A-C447563618D1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B5CC1C6F-E4E3-4818-AD5C-88215A5B498F}
+	EndGlobalSection
+EndGlobal
diff --git a/build/help/xml/index.xml b/build/help/xml/index.xml
@@ -1,4 +1,4 @@
 <Overview>
   <Remarks>Eto Cross Platform Framework</Remarks>
-  <Copyright>(c) 2012 by Curtis Wensley</Copyright>
+  <Copyright>© 2018 by Curtis Wensley</Copyright>
 </Overview>