(lucenenet) branch master updated: lucene-cli: Removed target and tests for net6.0 (fixes #979) (#981)

[paulirwin]

This is an automated email from the ASF dual-hosted git repository.

paulirwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git


The following commit(s) were added to refs/heads/master by this push:
     new e300f5416 lucene-cli: Removed target and tests for net6.0 (fixes #979) 
(#981)
e300f5416 is described below

commit e300f541691c7b476d32e74fb71cdb1ab010d3f2
Author: Shad Storhaug <s...@shadstorhaug.com>
AuthorDate: Tue Oct 22 04:27:47 2024 +0700

    lucene-cli: Removed target and tests for net6.0 (fixes #979) (#981)
---
 .../publish-test-results-for-test-projects.yml               | 12 +-----------
 .../tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj   |  4 ++--
 src/dotnet/tools/lucene-cli/lucene-cli.csproj                |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

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 ec2a1237d..7e9d8988b 100644
--- a/.build/azure-templates/publish-test-results-for-test-projects.yml
+++ b/.build/azure-templates/publish-test-results-for-test-projects.yml
@@ -81,7 +81,7 @@ steps:
     testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
     testResultsFileName: '${{ parameters.testResultsFileName }}'
 
-# Special case: Only supports net8.0 and net6.0
+# Special case: Only supports net8.0
 - template: publish-test-results.yml
   parameters:
     testProjectName: 'Lucene.Net.Tests.Cli'
@@ -92,16 +92,6 @@ steps:
     testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
     testResultsFileName: '${{ parameters.testResultsFileName }}'
 
-- template: publish-test-results.yml
-  parameters:
-    testProjectName: 'Lucene.Net.Tests.Cli'
-    framework: 'net6.0' # Since condtions are not supported for templates, we 
check for the file existence within publish-test-results.yml
-    vsTestPlatform: '${{ parameters.vsTestPlatform }}'
-    osName: '${{ parameters.osName }}'
-    testResultsFormat: '${{ parameters.testResultsFormat }}'
-    testResultsArtifactName: '${{ parameters.testResultsArtifactName }}'
-    testResultsFileName: '${{ parameters.testResultsFileName }}'
-
 # Special case: Only supports net8.0, net6.0 and net48
 
 - template: publish-test-results.yml
diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj 
b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
index 012c8326e..24e943dd0 100644
--- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
+++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
@@ -25,11 +25,11 @@
 
   <PropertyGroup>
     <!-- Allow specific target framework to flow in from 
TestTargetFrameworks.props -->
-    <TargetFrameworks Condition=" '$(TargetFramework)' == '' 
">net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetFramework)' == '' 
">net8.0</TargetFrameworks>
     <AssemblyTitle>Lucene.Net.Tests.Cli</AssemblyTitle>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or 
$(TargetFramework.StartsWith('net5.')) ">
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or 
$(TargetFramework.StartsWith('net5.')) Or 
$(TargetFramework.StartsWith('net6.')) ">
     <!-- For CI, we don't publish the projects and exclude them from the test 
run by setting IsPublishable=false and IsTestProject=false -->
     <IsPublishable>false</IsPublishable>
     <IsTestProject>false</IsTestProject>
diff --git a/src/dotnet/tools/lucene-cli/lucene-cli.csproj 
b/src/dotnet/tools/lucene-cli/lucene-cli.csproj
index 53bf6cf83..a41ccd18c 100644
--- a/src/dotnet/tools/lucene-cli/lucene-cli.csproj
+++ b/src/dotnet/tools/lucene-cli/lucene-cli.csproj
@@ -24,11 +24,11 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RollForward Condition=" $(TargetFramework.StartsWith('net8.')) 
">Major</RollForward>
 
     <IsPublishable>false</IsPublishable>
-    <IsPublishable Condition="'$(TargetFramework)' == 'net8.0' Or 
'$(TargetFramework)' == 'net6.0'">true</IsPublishable>
+    <IsPublishable Condition="'$(TargetFramework)' == 
'net8.0'">true</IsPublishable>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>lucene</ToolCommandName>