Migrate DocumentationProject through SHFB breaking change.

CXuesong · Jan 29, 2022 · e72a2b3 · e72a2b3
1 parent 6cae030
commit e72a2b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/DocumentationProject/DocumentationProject.shfbproj b/DocumentationProject/DocumentationProject.shfbproj
@@ -13,7 +13,7 @@
     <RootNamespace>DocumentationProject</RootNamespace>
     <Name>DocumentationProject</Name>
     <!-- SHFB properties -->
-    <FrameworkVersion>Cross-platform (.NET Core/.NET Standard)</FrameworkVersion>
+    <FrameworkVersion>.NET Core/.NET Standard/.NET 5.0+</FrameworkVersion>
     <OutputPath>Help\</OutputPath>
     <HtmlHelpName>WikiClientLibrary</HtmlHelpName>
     <Language>en-US</Language>
@@ -44,15 +44,16 @@
       <ComponentConfig id="API Token Resolution" enabled="True">
         <component id="API Token Resolution">
           {@TokenFiles}
-          <replace elements="/*//token" item="string(.)" /></component>
+          <replace elements="/*//token" item="string(.)" />
+        </component>
       </ComponentConfig>
       <ComponentConfig id="Code Block Component" enabled="True">
         <component id="Code Block Component">
           <basePath value="{@HtmlEncProjectFolder}" />
           <outputPaths>{@HelpFormatOutputPaths}</outputPaths>
           <allowMissingSource value="false" />
           <removeRegionMarkers value="false" />
-          <colorizer syntaxFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
+          <colorizer syntaxFile="{@CoreComponentsFolder}Colorizer\highlight.xml" styleFile="{@CoreComponentsFolder}Colorizer\highlight.xsl" stylesheet="{@CoreComponentsFolder}Colorizer\highlight.css" scriptFile="{@CoreComponentsFolder}Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
         </component>
       </ComponentConfig>
       <ComponentConfig id="Syntax Component" enabled="True">
@@ -105,7 +106,7 @@
     <NamingMethod>Guid</NamingMethod>
     <HelpTitle>Wiki Client Library</HelpTitle>
     <ContentPlacement>AboveNamespaces</ContentPlacement>
-    <CopyrightText>Copyright %28C%29 CXuesong 2020</CopyrightText>
+    <CopyrightText>Copyright %28C%29 CXuesong 2022</CopyrightText>
     <VisibleItems>Attributes, ExplicitInterfaceImplementations, InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable</VisibleItems>
     <HeaderText>
     </HeaderText>

diff --git a/WikiClientLibrary.Commons/CI/PrepEnv.ps1 b/WikiClientLibrary.Commons/CI/PrepEnv.ps1
@@ -42,11 +42,6 @@ if ($IsLinux) {
     if ($SHFB) {
         Write-Error "SHFB is not supported on Linux."
     }
-    if (-not (checkDotNetSdkVersions -Channel 2 -ErrorAction Continue)) {
-        sudo apt install dotnet-sdk-2.1
-        CheckLastExitCode
-        checkDotNetSdkVersions -Channel 2
-    }
     if (-not (checkDotNetSdkVersions -Channel 3 -ErrorAction Continue)) {
         sudo apt install dotnet-sdk-3.1
         CheckLastExitCode
@@ -61,10 +56,6 @@ if ($IsLinux) {
 elseif ($IsWindows) {
     # dotnet
     Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'DotNet-Install.ps1'
-    if (-not (checkDotNetSdkVersions -Channel 2 -ErrorAction Continue)) {
-        ./DotNet-Install.ps1 -Version 2.1.23
-        checkDotNetSdkVersions -Channel 2
-    }
     if (-not (checkDotNetSdkVersions -Channel 3 -ErrorAction Continue)) {
         ./DotNet-Install.ps1 -Version 3.1.10
         checkDotNetSdkVersions -Channel 3
@@ -76,7 +67,7 @@ elseif ($IsWindows) {
     # SHFB
     if ($SHFB) {
         Write-Host "Downloading SHFB."
-        Invoke-WebRequest "https://github.com/EWSoftware/SHFB/releases/download/v2019.9.15.0/SHFBInstaller_v2019.9.15.0.zip" -OutFile SHFBInstaller.zip
+        Invoke-WebRequest "https://github.com/EWSoftware/SHFB/releases/download/v2022.1.22.0/SHFBInstaller_v2022.1.22.0.zip" -OutFile SHFBInstaller.zip
         New-Item -ItemType Directory SHFBInstaller | Out-Null
         Expand-Archive SHFBInstaller.zip SHFBInstaller
         Write-Host "Downloading SHFB."