You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2022/02/09 04:46:22 UTC
[lucenenet] branch master updated (41ffbc7 -> 5900b3d)
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git.
from 41ffbc7 .github/workflows: Regenerated workflows for lucene-cli tests
new 52be291 Directory.Build.targets: Fixed project import references so they will work from nested solutions
new 88f7953 src/docs/LuceneDocsPlugins: Upgraded to use new .csproj format and build tools (see #601)
new 4de6ace websites/apidocs/docs.ps1: Upgraded project to use new .csproj format and .NET Core SDK build chain (see #601)
new 8bcd210 azure-pipelines.yml: Upgraded docs and website to use windows-latest (fixes #601)
new 5900b3d .github/workflows/Lucene-Net-Documentation.yml: Added .NET 6 SDK setup prior to running docs.ps1
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/Lucene-Net-Documentation.yml | 5 ++
Directory.Build.targets | 4 +-
azure-pipelines.yml | 8 +-
...rectory.Build.props => Directory.Build.targets} | 10 +--
src/{dotnet => docs}/Directory.Build.props | 0
.../Directory.Build.targets} | 10 +--
src/docs/DocumentationTools.sln | 4 +-
.../LuceneDocsPlugins/LuceneDocsPlugins.csproj | 88 +++++++++-------------
.../LuceneDocsPlugins/Properties/AssemblyInfo.cs | 25 ------
websites/apidocs/docs.ps1 | 45 ++++-------
10 files changed, 69 insertions(+), 130 deletions(-)
copy src/{Directory.Build.props => Directory.Build.targets} (63%)
copy src/{dotnet => docs}/Directory.Build.props (100%)
copy src/{Directory.Build.props => docs/Directory.Build.targets} (63%)
[lucenenet] 01/05: Directory.Build.targets: Fixed project import references so they will work from nested solutions
Posted by ni...@apache.org.
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 52be291e61db6dce05603d33f7bdb504285b2493
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jan 16 00:41:49 2022 +0700
Directory.Build.targets: Fixed project import references so they will work from nested solutions
---
Directory.Build.targets | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index d7c6e22..575b43b 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -20,7 +20,7 @@
-->
<Project>
- <Import Project="$(SolutionDir).build/dependencies.props" />
+ <Import Project=".build/dependencies.props" Condition="Exists('.build/dependencies.props')" />
<!-- Features in .NET 5.x and .NET 6.x only -->
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net5.')) Or $(TargetFramework.StartsWith('net6.')) ">
@@ -163,6 +163,6 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageReferenceVersion)" PrivateAssets="All"/>
</ItemGroup>
- <Import Project=".build\release.targets" Condition="Exists('.build\release.targets')" />
+ <Import Project=".build/release.targets" Condition="Exists('.build/release.targets')" />
</Project>
\ No newline at end of file
[lucenenet] 05/05: .github/workflows/Lucene-Net-Documentation.yml: Added .NET 6 SDK setup prior to running docs.ps1
Posted by ni...@apache.org.
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 5900b3d08b7b61d317875d0a8a5c2c9e28495f3f
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jan 16 02:44:14 2022 +0700
.github/workflows/Lucene-Net-Documentation.yml: Added .NET 6 SDK setup prior to running docs.ps1
---
.github/workflows/Lucene-Net-Documentation.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/Lucene-Net-Documentation.yml b/.github/workflows/Lucene-Net-Documentation.yml
index f2618e5..65eafb7 100644
--- a/.github/workflows/Lucene-Net-Documentation.yml
+++ b/.github/workflows/Lucene-Net-Documentation.yml
@@ -118,6 +118,11 @@ jobs:
git --git-dir "$Env:GIT_MAIN_REPO" checkout -b "docs/${{ env.RELEASE_VERSION }}"
shell: powershell
+ - name: Setup .NET 6 SDK
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: '6.0.101'
+
- name: Build docs
run: ./main-repo/websites/apidocs/docs.ps1 -Clean -LuceneNetVersion ${{ env.RELEASE_VERSION }}
shell: powershell
[lucenenet] 02/05: src/docs/LuceneDocsPlugins: Upgraded to use new .csproj format and build tools (see #601)
Posted by ni...@apache.org.
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 88f7953c111687a5bf06718d2dc86e7945908f95
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jan 16 00:45:26 2022 +0700
src/docs/LuceneDocsPlugins: Upgraded to use new .csproj format and build tools (see #601)
---
src/Directory.Build.targets | 23 ++++++
src/docs/Directory.Build.props | 35 +++++++++
src/docs/Directory.Build.targets | 23 ++++++
src/docs/DocumentationTools.sln | 4 +-
.../LuceneDocsPlugins/LuceneDocsPlugins.csproj | 88 +++++++++-------------
.../LuceneDocsPlugins/Properties/AssemblyInfo.cs | 25 ------
6 files changed, 119 insertions(+), 79 deletions(-)
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
new file mode 100644
index 0000000..5662d9c
--- /dev/null
+++ b/src/Directory.Build.targets
@@ -0,0 +1,23 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
\ No newline at end of file
diff --git a/src/docs/Directory.Build.props b/src/docs/Directory.Build.props
new file mode 100644
index 0000000..4fd6669
--- /dev/null
+++ b/src/docs/Directory.Build.props
@@ -0,0 +1,35 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+ <PropertyGroup>
+ <!-- According to the docs (https://docs.microsoft.com/en-us/cpp/build/reference/common-macros-for-build-commands-and-properties?view=vs-2019), the
+ SolutionDir is only available when running in the IDE, so we patch to ensure it also works when using dotnet.exe -->
+ <SolutionDir>$(MSBuildThisFileDirectory)../../</SolutionDir>
+ </PropertyGroup>
+
+ <PropertyGroup Label="Assembly Signing">
+ <!-- This is the default location of Lucene.Net.snk relative to the project directory.
+ If the project is further nested from the repo root, override this value in the csproj. -->
+ <AssemblyOriginatorKeyFile>$(SolutionDir)Lucene.Net.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/docs/Directory.Build.targets b/src/docs/Directory.Build.targets
new file mode 100644
index 0000000..5662d9c
--- /dev/null
+++ b/src/docs/Directory.Build.targets
@@ -0,0 +1,23 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
\ No newline at end of file
diff --git a/src/docs/DocumentationTools.sln b/src/docs/DocumentationTools.sln
index cf8208b..49c751f 100644
--- a/src/docs/DocumentationTools.sln
+++ b/src/docs/DocumentationTools.sln
@@ -18,11 +18,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# under the License.
VisualStudioVersion = 16.0.29521.150
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuceneDocsPlugins", "LuceneDocsPlugins\LuceneDocsPlugins.csproj", "{D5D1C256-4A5A-4C57-949D-E9A1FFB6A5D1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneDocsPlugins", "LuceneDocsPlugins\LuceneDocsPlugins.csproj", "{D5D1C256-4A5A-4C57-949D-E9A1FFB6A5D1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Info", "Info", "{D0D177C8-D797-4850-AB75-E91E3126761C}"
ProjectSection(SolutionItems) = preProject
convert.ps1 = convert.ps1
+ Directory.Build.props = Directory.Build.props
+ Directory.Build.targets = Directory.Build.targets
readme.md = readme.md
EndProjectSection
EndProject
diff --git a/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj b/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj
index d747c58..f656c64 100644
--- a/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj
+++ b/src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj
@@ -17,72 +17,54 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Label="Assembly Signing">
- <!-- Ensure this doesn't inherit the strong naming since this tool will no work with a signed assembly due to it's references -->
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net472</TargetFramework>
+ <AssemblyTitle>LuceneDocsPlugins</AssemblyTitle>
+ <Product>LuceneDocsPlugins</Product>
</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>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>LuceneDocsPlugins</RootNamespace>
- <AssemblyName>LuceneDocsPlugins</AssemblyName>
- <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
- <NuGetPackageImportStamp>
- </NuGetPackageImportStamp>
+
+ <PropertyGroup Label="Version Info">
+ <Version>1.0.0.0</Version>
+ <FileVersion>$(Version)</FileVersion>
+ <InformationalVersion>$(Version)</InformationalVersion>
+ <AssemblyVersion>$(Version)</AssemblyVersion>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\websites\apidocs\lucenetemplate\plugins\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+
+ <PropertyGroup Label="Assembly Publishing">
+ <IsPublishable>true</IsPublishable>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+
+ <PropertyGroup Label="Assembly Signing">
+ <!-- Ensure this doesn't inherit the strong naming since this tool will no work with a signed assembly due to it's references -->
+ <SignAssembly>false</SignAssembly>
</PropertyGroup>
+
<ItemGroup>
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System" />
- <Reference Include="System.Web" />
+ <Compile Remove="packages\**" />
+ <EmbeddedResource Remove="packages\**" />
+ <None Remove="packages\**" />
</ItemGroup>
+
<ItemGroup>
- <Compile Include="EnvironmentVariableInlineRule.cs" />
- <Compile Include="EnvironmentVariableRendererPart.cs" />
- <Compile Include="LuceneDfmEngineCustomizer.cs" />
- <Compile Include="LuceneNoteBlockRule.cs" />
- <Compile Include="LuceneNoteBlockToken.cs" />
- <Compile Include="RendererPartProvider.cs" />
- <Compile Include="LuceneNoteTokenRendererPart.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
+ <None Include="app.config" />
</ItemGroup>
+
<ItemGroup>
- <None Include="app.config" />
+ <PackageReference Include="Microsoft.Composition" Version="1.0.31" />
+ <PackageReference Include="Microsoft.DocAsCode.Dfm" Version="2.58.0" />
+ <PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
+
<ItemGroup>
- <PackageReference Include="Microsoft.Composition">
- <Version>1.0.31</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.DocAsCode.Dfm">
- <Version>2.58.0</Version>
- </PackageReference>
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System" />
+ <Reference Include="System.Web" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
</Project>
\ No newline at end of file
diff --git a/src/docs/LuceneDocsPlugins/Properties/AssemblyInfo.cs b/src/docs/LuceneDocsPlugins/Properties/AssemblyInfo.cs
index a2dbaa4..564327b 100644
--- a/src/docs/LuceneDocsPlugins/Properties/AssemblyInfo.cs
+++ b/src/docs/LuceneDocsPlugins/Properties/AssemblyInfo.cs
@@ -21,18 +21,6 @@ using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("LuceneDocsPlugins")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LuceneDocsPlugins")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
@@ -40,16 +28,3 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("d5d1c256-4a5a-4c57-949d-e9a1ffb6a5d1")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
[lucenenet] 03/05: websites/apidocs/docs.ps1: Upgraded project to use new .csproj format and .NET Core SDK build chain (see #601)
Posted by ni...@apache.org.
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 4de6ace495ae110f745399b744bb753c7485a23d
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jan 16 02:27:14 2022 +0700
websites/apidocs/docs.ps1: Upgraded project to use new .csproj format and .NET Core SDK build chain (see #601)
---
websites/apidocs/docs.ps1 | 45 ++++++++++++++-------------------------------
1 file changed, 14 insertions(+), 31 deletions(-)
diff --git a/websites/apidocs/docs.ps1 b/websites/apidocs/docs.ps1
index b35bb23..b344281 100644
--- a/websites/apidocs/docs.ps1
+++ b/websites/apidocs/docs.ps1
@@ -34,6 +34,7 @@ param (
[Parameter(Mandatory = $false)]
[int] $StagingPort = 8080
)
+$MinimumSdkVersion = "3.1.100" # Minimum Required .NET SDK (must not be a pre-release)
$ErrorActionPreference = "Stop"
@@ -80,26 +81,6 @@ if (-not (test-path $DocFxExe)) {
Expand-Archive $DocFxZip -DestinationPath (Join-Path -Path $ToolsFolder -ChildPath "docfx")
}
-# ensure we have NuGet
-New-Item "$ToolsFolder\nuget" -type directory -force
-$nuget = "$ToolsFolder\nuget\nuget.exe"
-if (-not (test-path $nuget)) {
- Write-Host "Download NuGet..."
- Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile $nuget -TimeoutSec 60
-}
-
-# ensure we have vswhere
-New-Item "$ToolsFolder\vswhere" -type directory -force
-$vswhere = "$ToolsFolder\vswhere\vswhere.exe"
-if (-not (test-path $vswhere)) {
- Write-Host "Download VsWhere..."
- $path = "$ToolsFolder\tmp"
- &$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
-}
-
Remove-Item -Recurse -Force "$ToolsFolder\tmp"
# delete anything that already exists
@@ -114,22 +95,24 @@ if ($Clean) {
# Build our custom docfx tools
if ($DisablePlugins -eq $false) {
- $MSBuild = &$vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1
- if (-not (test-path $MSBuild)) {
- throw "MSBuild not found!"
+ # Check prerequisites
+ $SdkVersion = ((& dotnet --version) | Out-String).Trim()
+ if ($LASTEXITCODE -ne 0) {
+ throw "dotnet command was not found. Please install .NET $MinimumSdkVersion or higher SDK and make sure it is in your PATH."
+ }
+ $ReleaseVersion = if ($sdkVersion.Contains('-')) { "$SdkVersion".Substring(0, "$SdkVersion".IndexOf('-')) } else { $SdkVersion }
+ if ([version]$ReleaseVersion -lt ([version]$MinimumSdkVersion)) {
+ throw "Minimum .NET SDK $MinimumSdkVersion required. Current SDK version is $ReleaseVersion. Please install the required SDK before running the command."
}
- # Build the plugin solution
- $pluginSln = (Join-Path -Path $RepoRoot "src\docs\DocumentationTools.sln")
- & $nuget restore $pluginSln
-
- if (-not $?) {throw "Failed to restore plugin sln"}
+ $pluginProject = (Join-Path -Path $RepoRoot "src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj")
+ $PluginsFolder = (Join-Path -Path $ApiDocsFolder "Templates/LuceneTemplate/plugins")
- $PluginsFolder = (Join-Path -Path $ApiDocsFolder "Templates\LuceneTemplate\plugins")
New-Item $PluginsFolder -type directory -force
- & $msbuild $pluginSln /target:LuceneDocsPlugins "/p:OutDir=$PluginsFolder"
+ # This will restore, build, and copy all files (including dependencies) to the output folder
+ & dotnet publish "$pluginProject" --configuration Release --output "$PluginsFolder" --verbosity normal
- if (-not $?) {throw "Failed to build plugin sln"}
+ if (-not $?) {throw "Failed to build plugin project"}
}
# update the docjx.global.json file based
[lucenenet] 04/05: azure-pipelines.yml: Upgraded docs and website to use windows-latest (fixes #601)
Posted by ni...@apache.org.
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 8bcd2101ffa226ae141d23a58d8295bbe5208155
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jan 16 02:36:44 2022 +0700
azure-pipelines.yml: Upgraded docs and website to use windows-latest (fixes #601)
---
azure-pipelines.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8926762..a0f550e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -267,9 +267,13 @@ stages:
- job: Docs
condition: and(succeeded(), eq(variables['GenerateDocs'], 'true'))
pool:
- vmImage: 'vs2017-win2016'
+ vmImage: 'windows-latest'
steps:
+ - template: '.build/azure-templates/install-dotnet-sdk.yml'
+ parameters:
+ sdkVersion: '$(DotNetSDKVersion)'
+
- pwsh: |
$(Build.SourcesDirectory)/websites/apidocs/docs.ps1 -LuceneNetVersion $(PackageVersion) -Clean -BaseUrl https://lucenenet.apache.org/docs/
errorActionPreference: 'continue'
@@ -293,7 +297,7 @@ stages:
- job: Website
condition: and(succeeded(), eq(variables['GenerateWebsite'], 'true'))
pool:
- vmImage: 'vs2017-win2016'
+ vmImage: 'windows-latest'
steps:
- pwsh: |