This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 95090b38c1c54808f12555906d7a7139e339539b Author: Shannon <[email protected]> AuthorDate: Wed Nov 18 15:36:07 2020 +1100 fixes comma and language version for net framework plugins --- .../JavaDocToMarkdownConverter.csproj | 5 +++- .../LuceneDocsPlugins/LuceneDocsPlugins.csproj | 5 +++- websites/apidocs/docs.ps1 | 30 ++++++++++++---------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/docs/JavaDocToMarkdownConverter/JavaDocToMarkdownConverter.csproj b/src/docs/JavaDocToMarkdownConverter/JavaDocToMarkdownConverter.csproj index 31b1713..e7df396 100644 --- a/src/docs/JavaDocToMarkdownConverter/JavaDocToMarkdownConverter.csproj +++ b/src/docs/JavaDocToMarkdownConverter/JavaDocToMarkdownConverter.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -29,6 +29,9 @@ </AssemblyOriginatorKeyFile> </PropertyGroup> <PropertyGroup> + <LangVersion>7.3</LangVersion> + </PropertyGroup> + <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{874179E7-FDA4-4E5B-9F86-54917BB6F74F}</ProjectGuid> diff --git a/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj b/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj index 6564d47..db6def1 100644 --- a/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj +++ b/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -25,6 +25,9 @@ under the License. </AssemblyOriginatorKeyFile> </PropertyGroup> <PropertyGroup> + <LangVersion>7.3</LangVersion> + </PropertyGroup> + <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{D5D1C256-4A5A-4C57-949D-E9A1FFB6A5D1}</ProjectGuid> diff --git a/websites/apidocs/docs.ps1 b/websites/apidocs/docs.ps1 index a4a1bac..5fab410 100644 --- a/websites/apidocs/docs.ps1 +++ b/websites/apidocs/docs.ps1 @@ -6,9 +6,9 @@ # The ASF licenses this file to You under the Apache License, Version 2.0 # (the ""License""); you may not use this file except in compliance with # the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an ""AS IS"" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,7 +29,9 @@ param ( [Parameter(Mandatory = $false)] [string] $LogLevel = 'Warning', [Parameter(Mandatory = $false)] - [string] $BaseUrl = 'https://lucenenet.apache.org/docs/' + [string] $BaseUrl = 'https://lucenenet.apache.org/docs/', + [Parameter(Mandatory = $false)] + [int] $StagingPort = 8080 ) # if the base URL is the lucene live site default value we also need to include the version @@ -59,9 +61,9 @@ New-Item "$ToolsFolder\docfx" -type directory -force $DocFxExe = "$ToolsFolder\docfx\docfx.exe" if (-not (test-path $DocFxExe)) { Write-Host "Retrieving docfx..." - $DocFxZip = "$ToolsFolder\tmp\docfx.zip" - Invoke-WebRequest "https://github.com/dotnet/docfx/releases/download/v2.56.2/docfx.zip"; -OutFile $DocFxZip -TimeoutSec 60 - + $DocFxZip = "$ToolsFolder\tmp\docfx.zip" + Invoke-WebRequest "https://github.com/dotnet/docfx/releases/download/v2.56.2/docfx.zip"; -OutFile $DocFxZip -TimeoutSec 60 + #unzip Expand-Archive $DocFxZip -DestinationPath (Join-Path -Path $ToolsFolder -ChildPath "docfx") } @@ -83,7 +85,7 @@ if (-not (test-path $vswhere)) { &$nuget install vswhere -OutputDirectory $path $dir = Get-ChildItem "$path\vswhere.*" | Sort-Object -property Name -descending | Select-Object -first 1 $file = Get-ChildItem -path "$dir" -name vswhere.exe -recurse - Move-Item "$dir\$file" $vswhere + Move-Item "$dir\$file" $vswhere } Remove-Item -Recurse -Force "$ToolsFolder\tmp" @@ -104,11 +106,11 @@ if ($DisablePlugins -eq $false) { if (-not (test-path $MSBuild)) { throw "MSBuild not found!" } - + # Build the plugin solution $pluginSln = (Join-Path -Path $RepoRoot "src\docs\DocumentationTools.sln") & $nuget restore $pluginSln - + $PluginsFolder = (Join-Path -Path $ApiDocsFolder "Templates\LuceneTemplate\plugins") New-Item $PluginsFolder -type directory -force & $msbuild $pluginSln /target:LuceneDocsPlugins "/p:OutDir=$PluginsFolder" @@ -134,7 +136,7 @@ $DocFxJsonMeta = @( "docfx.analysis-smartcn.json", "docfx.analysis-stempel.json", "docfx.benchmark.json", - "docfx.classification.json", + "docfx.classification.json", "docfx.expressions.json", "docfx.facet.json", "docfx.grouping.json", @@ -157,13 +159,13 @@ $DocFxJsonSite = Join-Path -Path $ApiDocsFolder "docfx.site.json" # set env vars that will be replaced in Markdown $env:LuceneNetVersion = $LuceneNetVersion -if ($? -and $DisableMetaData -eq $false) { +if ($? -and $DisableMetaData -eq $false) { foreach ($proj in $DocFxJsonMeta) { $projFile = Join-Path -Path $ApiDocsFolder $proj $DocFxLog = Join-Path -Path $ApiDocsFolder "obj\${proj}.meta.log" - # build the output + # build the output Write-Host "Building api metadata for $projFile..." if ($Clean) { @@ -175,7 +177,7 @@ if ($? -and $DisableMetaData -eq $false) { } } -if ($? -and $DisableBuild -eq $false) { +if ($? -and $DisableBuild -eq $false) { foreach ($proj in $DocFxJsonMeta) { $projFile = Join-Path -Path $ApiDocsFolder $proj @@ -218,7 +220,7 @@ if ($?) { if ($ServeDocs -eq $false) { - # build the output + # build the output Write-Host "Building docs..." if ($Clean) {
