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 d2ade831c5121b74d5bc9ec76c0899b1bb50cceb Author: Shad Storhaug <[email protected]> AuthorDate: Wed Jun 24 20:58:16 2020 +0700 Downgraded tests from netcoreapp2.2 to netcoreapp2.1 because 2.2 is no longer supported and 2.1 is: https://devblogs.microsoft.com/dotnet/net-core-2-2-will-reach-end-of-life-on-december-23-2019/ --- TestTargetFramework.props | 4 ++-- azure-pipelines.yml | 10 +++++----- .../azure-templates/publish-test-results-for-test-projects.yml | 2 +- build/build.ps1 | 2 +- .../Lucene.Net.Tests.TestFramework.csproj | 2 +- .../Lucene.Net.Tests.CodeAnalysis.csproj | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/TestTargetFramework.props b/TestTargetFramework.props index 28d2b2f..57b4430 100644 --- a/TestTargetFramework.props +++ b/TestTargetFramework.props @@ -27,13 +27,13 @@ Note that the main libraries are multi-targeted, so this has no effect on how they are compiled, this setting only affects the test projects. --> <!--<TargetFramework>net48</TargetFramework>--> - <!--<TargetFramework>netcoreapp2.2</TargetFramework>--> + <!--<TargetFramework>netcoreapp2.1</TargetFramework>--> <TargetFramework>netcoreapp3.1</TargetFramework> <!-- Allow the build script to pass in the test frameworks to build for. This overrides the above TargetFramework setting. LUCENENET TODO: Due to a parsing bug, we cannot pass a string with a ; to dotnet msbuild, so passing true as a workaround --> - <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">netcoreapp3.1;netcoreapp2.2</TargetFrameworks> + <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">netcoreapp3.1;netcoreapp2.1</TargetFrameworks> <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48</TargetFrameworks> <TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework> </PropertyGroup> diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c71e9d..432768f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -125,11 +125,11 @@ stages: condition: and(succeeded(), ne(variables['RunTests'], 'false')) - task: ArchiveFiles@2 - displayName: 'Zip $(PublishTempDirectory)/netcoreapp2.2' + displayName: 'Zip $(PublishTempDirectory)/netcoreapp2.1' inputs: - rootFolderOrFile: '$(PublishTempDirectory)/netcoreapp2.2' + rootFolderOrFile: '$(PublishTempDirectory)/netcoreapp2.1' includeRootFolder: false - archiveFile: '$(PublishDirectory)/netcoreapp2.2/$(PublishedArtifactZipFileName)' + archiveFile: '$(PublishDirectory)/netcoreapp2.1/$(PublishedArtifactZipFileName)' condition: and(succeeded(), ne(variables['RunTests'], 'false')) - task: ArchiveFiles@2 @@ -295,14 +295,14 @@ stages: osName: 'macOS' imageName: 'macOS-10.14' maximumAllowedFailures: 4 # Maximum allowed failures for a successful build - displayName: 'Test netcoreapp2.2 on' + displayName: 'Test netcoreapp2.1 on' pool: vmImage: $(imageName) steps: - template: 'build/azure-templates/run-tests-on-os.yml' parameters: osName: $(osName) - framework: 'netcoreapp2.2' + framework: 'netcoreapp2.1' testResultsArtifactName: '$(TestResultsArtifactName)' publishedArtifactZipFileName: '$(PublishedArtifactZipFileName)' maximumParallelJobs: 8 diff --git a/build/azure-templates/publish-test-results-for-test-projects.yml b/build/azure-templates/publish-test-results-for-test-projects.yml index d0605f9..04f6eb3 100644 --- a/build/azure-templates/publish-test-results-for-test-projects.yml +++ b/build/azure-templates/publish-test-results-for-test-projects.yml @@ -69,7 +69,7 @@ steps: # Special case: Only supports .NET Standard 2.0 - template: publish-test-results.yml parameters: - framework: 'netcoreapp2.2' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml + framework: 'netcoreapp2.1' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml testProjectName: 'Lucene.Net.Tests.CodeAnalysis' osName: '${{ parameters.osName }}' testResultsFormat: '${{ parameters.testResultsFormat }}' diff --git a/build/build.ps1 b/build/build.ps1 index 36c82d1..ead5044 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -48,7 +48,7 @@ properties { [int]$maximumParalellJobs = 8 #test paramters - [string]$frameworks_to_test = "netcoreapp3.1,netcoreapp2.2,net48" + [string]$frameworks_to_test = "netcoreapp3.1,netcoreapp2.1,net48" [string]$where = "" } diff --git a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj index 8aae68c..4efffa7 100644 --- a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj +++ b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj @@ -58,7 +58,7 @@ <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "> <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" /> </ItemGroup> diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj index b94c9c6..3e39c33 100644 --- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj +++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj @@ -22,7 +22,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netcoreapp2.2</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <RootNamespace>Lucene.Net.CodeAnalysis</RootNamespace> </PropertyGroup>
